diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1a11d46..23eb724 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,10 +19,27 @@ jobs:
       - run: make install
       - run: make smoke-test
 
+  build-python38:
+    docker:
+      - image: python:3.8
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - model-cache
+      - run: make models
+      - save_cache:
+          key: model-cache
+          paths:
+            models_eynollah.tar.gz
+            models_eynollah
+      - run: make install
+      - run: make smoke-test
+
 workflows:
   version: 2
   build:
     jobs:
       #- build-python36
       - build-python37
-      #- build-python38
+      - build-python38
diff --git a/.github/workflows/test-eynollah.yml b/.github/workflows/test-eynollah.yml
index 1afd2a6..9e8d7b1 100644
--- a/.github/workflows/test-eynollah.yml
+++ b/.github/workflows/test-eynollah.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6'] # '3.7'
+        python-version: ['3.7'] # '3.8'
 
     steps:
     - uses: actions/checkout@v2