diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0767209e..6b29bc45 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,9 +26,9 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - v2-dependencies-{{ checksum "setup.py" }}
-          # fallback to using the latest cache if no exact match is found
-          - v2-dependencies-
+            - v2-dependencies-{{ checksum "setup.py" }}
+            # fallback to using the latest cache if no exact match is found
+            - v2-dependencies-
 
       - run:
           name: install dependencies
@@ -49,20 +49,30 @@ jobs:
 
       - restore_cache:
           keys:
-          - v3-dolfin-jit-cache
+            - v3-dolfin-jit-cache
+
+      - run:
+          name: Flake8 tests
+          command: |
+            python3 -m flake8
+
+      - run:
+          name: Install dolfin-adjoint
+          command: |
+            git clone https://github.com/dolfin-adjoint/dolfin-adjoint ~/dolfin-adjoint
+            python3 -m pip install -e ~/dolfin-adjoint[all]
 
-      # run tests!
       - run:
           name: Run tests
           command: |
-            coverage run --source=fenics_adjoint,pyadjoint -m pytest tests/fenics_adjoint/ tests/pyadjoint/
+            coverage run --source=fenics_adjoint -m pytest ~/dolfin-adjoint/tests/fenics_adjoint/
             coverage report
             coverage html
 
       - run:
-          name: Flake8 tests
+          name: Run migration tests
           command: |
-            python3 -m flake8
+            python3 -m pytest ~/dolfin-adjoint/tests/migration
 
       - save_cache:
           key: v2-dolfin-jit-cache
@@ -81,7 +91,6 @@ jobs:
     docker:
       - image: firedrakeproject/firedrake:latest
 
-
     working_directory: ~/repo
 
     steps:
@@ -120,7 +129,6 @@ jobs:
       - store_artifacts:
           path: htmlcov
 
-
 workflows:
   version: 2
   all: