diff --git a/.circleci/cmake_test.sh b/.circleci/cmake_test.sh
index 30bf40b51..023d4d2fa 100755
--- a/.circleci/cmake_test.sh
+++ b/.circleci/cmake_test.sh
@@ -11,6 +11,7 @@
 RESULTDIR=result
 DATADIR=data
 
+sudo apt-get install cmake
 ./.circleci/pull_data.sh
 mkdir buildc && cd buildc && cmake .. && make && cd ..
 cp buildc/fasttext .
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc2b6ffbc..622be1943 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,7 @@
 
 version: 2
 jobs:
-  "py361-python":
+  "py361":
     docker:
       - image: circleci/python:3.6.1
     working_directory: ~/repo
@@ -31,10 +31,11 @@ jobs:
       - checkout
       - run:
           command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/python_test.sh
+            sudo pip install pybind11
+            sudo python setup.py install
+            . .circleci/cmake_test.sh
 
-  "py353-python":
+  "py353":
     docker:
       - image: circleci/python:3.5.3
     working_directory: ~/repo
@@ -42,10 +43,11 @@ jobs:
       - checkout
       - run:
           command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/python_test.sh
+            sudo pip install pybind11
+            sudo python setup.py install
+            . .circleci/cmake_test.sh
 
-  "py346-python":
+  "py346":
     docker:
       - image: circleci/python:3.4.6
     working_directory: ~/repo
@@ -53,10 +55,11 @@ jobs:
       - checkout
       - run:
           command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/python_test.sh
+            sudo pip install pybind11
+            sudo python setup.py install
+            . .circleci/cmake_test.sh
 
-  "py336-python":
+  "py336":
     docker:
       - image: circleci/python:3.3.6
     working_directory: ~/repo
@@ -64,10 +67,11 @@ jobs:
       - checkout
       - run:
           command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/python_test.sh
+            sudo pip install pybind11
+            sudo python setup.py install
+            . .circleci/cmake_test.sh
 
-  "py2713-python":
+  "py2713":
     docker:
       - image: circleci/python:2.7.13
     working_directory: ~/repo
@@ -75,8 +79,9 @@ jobs:
       - checkout
       - run:
           command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/python_test.sh
+            sudo pip install pybind11
+            sudo python setup.py install
+            . .circleci/cmake_test.sh
 
   "gcc5":
     docker:
@@ -118,61 +123,6 @@ jobs:
           command: |
             . .circleci/gcc_test.sh
 
-  "debian-wheezy-gcc":
-    docker:
-      - image: debian:wheezy
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_debian.sh
-            . .circleci/gcc_test.sh
-
-  "debian-wheezy-cmake":
-    docker:
-      - image: debian:wheezy
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_debian.sh
-            . .circleci/cmake_test.sh
-
-  "debian-jessie-gcc":
-    docker:
-      - image: debian:jessie
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_debian.sh
-            . .circleci/gcc_test.sh
-
-  "debian-jessie-cmake":
-    docker:
-      - image: debian:jessie
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_debian.sh
-            . .circleci/cmake_test.sh
-
-  "debian-jessie-python":
-    docker:
-      - image: debian:jessie
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_debian.sh
-            . .circleci/python_test.sh
-
   "website-build":
     docker:
       - image: node:latest
@@ -190,18 +140,13 @@ workflows:
   version: 2
   build:
     jobs:
-      - "py361-python"
-      - "py353-python"
-      - "py346-python"
-      - "py336-python"
-      - "py2713-python"
+      - "py361"
+      - "py353"
+      - "py346"
+      - "py336"
+      - "py2713"
       - "gcc5"
       - "gcc6"
       - "gcc7"
       - "gcclatest"
-      - "debian-wheezy-gcc"
-      - "debian-wheezy-cmake"
-      - "debian-jessie-gcc"
-      - "debian-jessie-cmake"
-      - "debian-jessie-python"
       - "website-build"