diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0849cfe9..9db1b0aa7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
             - v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
       - run: sudo apt-get install -y cmake
       - run: rustup default nightly-2018-10-07
-      - run: cargo test
+      - run: make test
 
       - save_cache:
           paths:
diff --git a/Makefile b/Makefile
index 8ba1377e1..af631c70a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,4 +14,4 @@ install:
 	cargo install --path .
 
 test:
-	cargo test
+	cargo test -- --test-threads=1