diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb29522fe..c07d45f3d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,46 +43,6 @@ jobs:
       - codecov/upload: 
           flags: 'test_11,multi'
 
-  test-11_check-non-adaptive-multi:
-    docker:
-      - image: 'citus/exttester-11:latest'
-    working_directory: /home/circleci/project
-    steps:
-      - attach_workspace:
-          at: .
-      - run: 
-          name: 'Install and Test (check-non-adaptive-executors)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-multi-non-adaptive'
-      - codecov/upload:
-          flags: 'test_11,multi'
-
-  test-11_check-non-adaptive-failure:
-    docker:
-      - image: 'citus/failtester-11:latest'
-    working_directory: /home/circleci/project
-    steps:
-      - attach_workspace: 
-          at: .
-      - run: 
-          name: 'Install and Test (check-non-adaptive-executors)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-failure-non-adaptive'
-      - codecov/upload:
-          flags: 'test_11,failure'
-
-  test-11_check-non-adaptive-isolation:
-    docker:
-      - image: 'citus/exttester-11:latest'
-    working_directory: /home/circleci/project
-    steps:
-      - attach_workspace:
-          at: .
-      - run: 
-          name: 'Install and Test (check-non-adaptive-executors)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-isolation-non-adaptive'
-      - codecov/upload: 
-          flags: 'test_11,isolation'
-
-
   test-11_check-tt-van-mx:
     docker:
       - image: 'citus/exttester-11:latest'
@@ -210,19 +170,6 @@ jobs:
       - store_artifacts:
           path: '/tmp/core_dumps'
 
-  test-12_check-non-adaptive-multi:
-    docker:
-      - image: 'citus/exttester-12:latest'
-    working_directory: /home/circleci/project
-    steps:
-      - attach_workspace:
-          at: .
-      - run: 
-          name: 'Install and Test (check-non-adaptive-executors)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-multi-non-adaptive'
-      - codecov/upload:
-          flags: 'test_12,multi'
-
   test-12_check-failure:
     docker:
       - image: 'citus/failtester-12:latest'
@@ -234,34 +181,6 @@ jobs:
           name: 'Install and Test (check-failure)'
           command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-failure'
 
-  test-12_check-non-adaptive-failure:
-    docker:
-      - image: 'citus/failtester-12:latest'
-    working_directory: /home/circleci/project
-    steps:
-      - attach_workspace: 
-          at: .
-      - run: 
-          name: 'Install and Test (check-non-adaptive-executors)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-failure-non-adaptive'
-      - codecov/upload:
-          flags: 'test_12,failure'        
-
-  test-12_check-non-adaptive-isolation:
-    docker:
-      - image: 'citus/exttester-12:latest'
-    working_directory: /home/circleci/project
-    steps:
-      - attach_workspace:
-          at: .
-      - run: 
-          name: 'Install and Test (check-non-adaptive-executors)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-isolation-non-adaptive'
-      - codecov/upload: 
-          flags: 'test_12,isolation'        
-
-
-
   test-11_check-citus-upgrade:
     docker:
       - image: 'citus/citusupgradetester-11:latest'
@@ -305,13 +224,6 @@ workflows:
       - test-11_check-failure:
           requires: [build]
 
-      - test-11_check-non-adaptive-multi: 
-          requires: [build]
-      - test-11_check-non-adaptive-failure:
-          requires: [build]
-      - test-11_check-non-adaptive-isolation:
-          requires: [build]
-
       - test-12_check-multi:
           requires: [build] 
       - test-12_check-tt-van-mx:
@@ -323,13 +235,6 @@ workflows:
       - test-12_check-failure:
           requires: [build]        
 
-      - test-12_check-non-adaptive-multi:
-          requires: [build]
-      - test-12_check-non-adaptive-failure:
-          requires: [build]   
-      - test-12_check-non-adaptive-isolation:
-          requires: [build] 
-
       - test-11-12_check-pg-upgrade: 
           requires: [build]