diff --git a/.circleci/config.yml b/.circleci/config.yml
index 77ee350e8..2ee7bbbca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -554,7 +554,7 @@ jobs:
       make:
         description: 'make target'
         type: string
-        default: check-minimal
+        default: ''
       test:
         description: 'the test that should be run multiple times'
         type: string
@@ -562,7 +562,7 @@ jobs:
       runs:
         description: 'number of times that the test should be run in total'
         type: integer
-        default: 1600
+        default: 2
     docker:
       - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
     working_directory: /home/circleci/project
@@ -572,12 +572,13 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: 'Detect newly introduced tests'
+          name: 'Detect regression tests need to be ran'
           command: |
             testForDebugging="<< parameters.test >>"
 
             if [ -z "$testForDebugging" ]; then
-              tests=$(git diff origin/main --name-status --oneline --diff-filter=A | (grep 'src/test/regress/sql/' || true) | rev | cut -d "/" -f1 | rev | sed 's/.sql//g' | tr '\n' ' ' | sed 's/.$//')
+              detected_changes=$(git diff origin/HEAD --name-only --diff-filter=A | (grep 'src/test/regress/sql/.*.sql\|src/test/regress/spec/.*.spec' || true))
+              tests=${detected_changes}
             else
               tests=$testForDebugging;
             fi
@@ -585,6 +586,8 @@ jobs:
             if [ -z "$tests" ]; then
                 echo "No test found."
                 circleci-agent step halt
+            else
+              echo "Detected tests " $tests
             fi
 
             echo export tests=\""$tests"\" >> "$BASH_ENV"
@@ -608,8 +611,8 @@ jobs:
             tests_array=($tests)
             for test in "${tests_array[@]}"
             do
-                echo "Running : $test on << parameters.make >>"
-                gosu circleci make -C src/test/regress << parameters.make >> EXTRA_TESTS="$(for i in $(seq << parameters.runs >> | circleci tests split); do echo -n $test '' ; done)"
+                echo $test
+                gosu circleci src/test/regress/bin/run_test.py -t $test -n << parameters.runs >> -s << parameters.make >>
             done
           no_output_timeout: 2m
       - run:
diff --git a/src/test/regress/bin/run_test.py b/src/test/regress/bin/run_test.py
index 46b86c434..48f2a14bd 100755
--- a/src/test/regress/bin/run_test.py
+++ b/src/test/regress/bin/run_test.py
@@ -12,7 +12,7 @@ import re
 args = argparse.ArgumentParser()
 args.add_argument("-t", "--test", required=True, help="Relative path for test file (must have a .sql or .spec extension)", type=pathlib.Path)
 args.add_argument("-n", "--ntimes", required=True, help="Number of test to run", type=int)
-args.add_argument("-s", "--schedule", required=False, help="Test schedule to be used as a base (optional)", default='')
+args.add_argument("-s", "--schedule", required=False, help="Test schedule to be used as a base (optional)", nargs='?', const='', default='')
 
 args = vars(args.parse_args())
 
@@ -76,15 +76,14 @@ else:
     make_recipe = 'check-custom-schedule'
 
 # prepare command to run tests
-test_command = f"make {make_recipe} SCHEDULE='{pathlib.Path(tmp_schedule_path).stem}'"
+test_command = f"make -C {regress_dir} {make_recipe} SCHEDULE='{pathlib.Path(tmp_schedule_path).stem}'"
 
 # run test command n times
 for i in range(args['ntimes']):
-    print(f"Execution#{i} of {test_command}")
+    print(f"Execution#{i}/{args['ntimes']} of {test_command}")
     result = os.system(test_command)
     if result != 0:
-        shutil.copy2(os.path.join(regress_dir, "regression.diffs"), os.path.join(regress_dir, f"regression_{i}.diffs"))
-        shutil.copy2(os.path.join(regress_dir, "regression.out"), os.path.join(regress_dir, f"regression_{i}.out"))
+        sys.exit(2)
 
 # remove temp schedule file
 os.remove(tmp_schedule_path)