diff --git a/circle.yml b/circle.yml
index e560a8057a0..5fe3ded1b54 100644
--- a/circle.yml
+++ b/circle.yml
@@ -16,12 +16,6 @@ machine:
 
 dependencies:
 
-    pre:
-        - "[ -e ~/.local/bin/circleci-matrix ]
-           || mkdir -p ~/.local/bin
-           && curl -fsSL https://raw.githubusercontent.com/michaelcontento/circleci-matrix/master/src/circleci-matrix.sh -o ~/.local/bin/circleci-matrix
-           && chmod +x ~/.local/bin/circleci-matrix"
-
     override:
         - pip install -r requirement-setuptools.txt
         - pip install -r requirements.txt
@@ -58,8 +52,8 @@ database:
 test:
 
     override:
-        - circleci-matrix:
-            parallel: true
+        - mkdir -p $CIRCLE_TEST_REPORTS/nose
+        - nosetests --ckan --reset-db --with-pylons=test-core.ini --nologcapture --with-coverage --cover-package=ckan --cover-package=ckanext --with-xunit --xunit-file=$CIRCLE_TEST_REPORTS/nose/junit.xml ckan ckanext
 
     post:
         - paster serve test-core.ini: