diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea7148b39b..67c45002e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,6 +40,14 @@ jobs:
           name: Run openfisca-core tests
           command: make test-core pytest_args="--exitfirst"
 
+      - run:
+          name: Run country-template tests
+          command: make test-country pytest_args="--exitfirst"
+
+      - run:
+          name: Run extension-template tests
+          command: make test-extension pytest_args="--exitfirst"
+
       - run:
           name: Check NumPy typing against latest 3 minor versions
           command: for i in {1..3}; do VERSION=$(.circleci/get-numpy-version.py prev) && pip install numpy==$VERSION && make check-types; done
@@ -49,12 +57,6 @@ jobs:
           paths:
             - .coverage
 
-      - run:
-          name: Run Country Template tests
-          command: |
-            COUNTRY_TEMPLATE_PATH=`python -c "import openfisca_country_template; print(openfisca_country_template.CountryTaxBenefitSystem().get_package_metadata()['location'])"`
-            openfisca test $COUNTRY_TEMPLATE_PATH/openfisca_country_template/tests/
-
   test_docs:
     docker:
       - image: python:3.7