diff --git a/.circleci/config.yml b/.circleci/config.yml
index ba9d6a4ac..7d2b8b437 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -200,36 +200,6 @@ jobs:
       - store_artifacts:
           path: '/tmp/core_dumps'
 
-  test-11_check-columnar:
-    docker:
-      - image: 'citus/exttester:11.9'
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: 'Install and Test (check-columnar)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-columnar'
-          no_output_timeout: 2m
-      - codecov/upload:
-          flags: 'test_11,columnar'
-
-  test-11_check-columnar-isolation:
-    docker:
-      - image: 'citus/exttester:11.9'
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: 'Install and Test (check-columnar-isolation)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-columnar-isolation'
-          no_output_timeout: 2m
-      - codecov/upload:
-          flags: 'test_11,columnar,isolation'
-
   test-11_check-failure:
     docker:
       - image: 'citus/failtester:11.9'
@@ -647,10 +617,6 @@ workflows:
           requires: [build-11]
       - test-11_check-follower-cluster:
           requires: [build-11]
-      - test-11_check-columnar:
-          requires: [build-11]
-      - test-11_check-columnar-isolation:
-          requires: [build-11]
       - test-11_check-failure:
           requires: [build-11]
 
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index 9b5a38fcb..c9c171afc 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -161,20 +161,13 @@ check-follower-cluster: all
 	$(pg_regress_multi_check) --load-extension=citus --follower-cluster \
 	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_follower_schedule $(EXTRA_TESTS)
 
-COLUMNAR_SCHEDULES =
-COLUMNAR_ISOLATION_SCHEDULES =
-ifeq ($(HAS_TABLEAM),yes)
-  COLUMNAR_SCHEDULES += columnar_am_schedule
-  COLUMNAR_ISOLATION_SCHEDULES += columnar_am_isolation_schedule
-endif
-
 check-columnar:
 	$(pg_regress_multi_check) --load-extension=citus \
-	-- $(MULTI_REGRESS_OPTS) $(addprefix --schedule=$(citus_abs_srcdir)/,$(COLUMNAR_SCHEDULES)) $(EXTRA_TESTS)
+	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_am_schedule $(EXTRA_TESTS)
 
 check-columnar-isolation: all  $(isolation_test_files)
 	$(pg_regress_multi_check) --load-extension=citus --isolationtester \
-	-- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build $(addprefix --schedule=$(citus_abs_srcdir)/,$(COLUMNAR_ISOLATION_SCHEDULES)) $(EXTRA_TESTS)
+	-- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build --schedule=$(citus_abs_srcdir)/columnar_am_isolation_schedule $(EXTRA_TESTS)
 
 check-failure: all
 	$(pg_regress_multi_check) --load-extension=citus --mitmproxy \