diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0b81c3896..c7fe384d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,8 +38,25 @@ jobs:
     working_directory: /home/circleci/project
     steps:
       - {attach_workspace: {at: .}}
-      - {run: {name: 'Install and Test (check-iso-work-fol)', command: 'install-and-test-ext check-isolation check-worker check-follower-cluster'}}
-      - {codecov/upload: {flags: 'test_10,isolation,worker,follower'}}
+      - {run: {name: 'Install and Test (check-iso-work-fol)', command: 'install-and-test-ext check-isolation check-worker'}}
+      - {codecov/upload: {flags: 'test_10,isolation,worker'}}
+  test-10_check-fol:
+    docker:
+      - {image: 'citusdata/exttester-10:latest'}
+    working_directory: /home/circleci/project
+    steps:
+      - {attach_workspace: {at: .}}
+      - run:
+          name: 'Enable core dumps'
+          command: 'ulimit -c unlimited'
+      - {run: {name: 'Install and Test (fol)', command: 'install-and-test-ext check-follower-cluster'}}
+      - run:
+          command: |
+            mkdir -p /tmp/core_dumps
+            cp core.* /tmp/core_dumps
+          when: on_fail
+      - {codecov/upload: {flags: 'follower'}}
+      - {store_artifacts: {path: '/tmp/core_dumps'}}
   test-10_check-failure:
     docker:
       - {image: 'citusdata/failtester-10:latest'}
@@ -69,8 +86,25 @@ jobs:
     working_directory: /home/circleci/project
     steps:
       - {attach_workspace: {at: .}}
-      - {run: {name: 'Install and Test (check-iso-work-fol)', command: 'install-and-test-ext check-isolation check-worker check-follower-cluster'}}
-      - {codecov/upload: {flags: 'test_11,isolation,worker,follower'}}
+      - {run: {name: 'Install and Test (check-iso-work-fol)', command: 'install-and-test-ext check-isolation check-worker'}}
+      - {codecov/upload: {flags: 'test_11,isolation,worker'}}
+  test-11_check-fol:
+    docker:
+      - {image: 'citusdata/exttester-11:latest'}
+    working_directory: /home/circleci/project
+    steps:
+      - {attach_workspace: {at: .}}
+      - run:
+          name: 'Enable core dumps'
+          command: 'ulimit -c unlimited'
+      - {run: {name: 'Install and Test (fol)', command: 'install-and-test-ext check-follower-cluster'}}
+      - run:
+          command: |
+            mkdir -p /tmp/core_dumps
+            cp core.* /tmp/core_dumps
+          when: on_fail
+      - {codecov/upload: {flags: 'follower'}}
+      - {store_artifacts: {path: '/tmp/core_dumps'}}
   test-11_check-failure:
     docker:
       - {image: 'citusdata/failtester-11:latest'}
@@ -88,9 +122,11 @@ workflows:
       - {test-10_check-multi: {requires: [build]}}
       - {test-10_check-tt-van-mx: {requires: [build]}}
       - {test-10_check-iso-work-fol: {requires: [build]}}
+      - {test-10_check-fol: {requires: [build]}}
       - {test-10_check-failure: {requires: [build]}}
 
       - {test-11_check-multi: {requires: [build]}}
       - {test-11_check-tt-van-mx: {requires: [build]}}
       - {test-11_check-iso-work-fol: {requires: [build]}}
+      - {test-11_check-fol: {requires: [build]}}
       - {test-11_check-failure: {requires: [build]}}