diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index e98606eb3b..1739f102fa 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -62,6 +62,7 @@ jobs:
         id: check_format
         run: |
           ./check_repo.sh
+          ./check_prepared_tests.sh
         env:
           BRANCH_NAME: ${{ github.head_ref }}
           CHANGE_TARGET: ${{ github.base_ref }}
@@ -84,6 +85,7 @@ jobs:
           if [ "$code" != 0 ]; then
             echo "Please run ./format_repo.sh to fix this pull request's formatting"
           fi
+          ./check_prepared_tests.sh
         env:
           BRANCH_NAME: ${{ github.head_ref }}
           CHANGE_TARGET: ${{ github.base_ref }}
diff --git a/check_prepared_tests.sh b/check_prepared_tests.sh
new file mode 100755
index 0000000000..9eec824de0
--- /dev/null
+++ b/check_prepared_tests.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eo pipefail
+
+enginetest_path=enginetest/memory_engine_test.go
+all_cnt=$(grep "func Test.*" "$enginetest_path" | wc -l |  tr -dc '0-9')
+prep_cnt=$(grep "func Test.*Prepared" "$enginetest_path" | wc -l | tr -dc '0-9')
+skip_cnt=$(grep "SkipPreparedsCount" "$enginetest_path" | awk '{print $4}' | tr -dc '0-9')
+
+expected="$((all_cnt-skip_cnt))"
+if [[ "$expected" != "$prep_cnt" ]]; then
+    echo "Expected '$expected' TestPrepared enginetests in $enginetest_path, found: '$prep_cnt'"
+    echo "Either increment SkipPreparedsCount or add a prepared test for the new test suite"
+    exit 1
+fi
+
diff --git a/enginetest/memory_engine_test.go b/enginetest/memory_engine_test.go
index 28e404af3d..fd53edc34d 100644
--- a/enginetest/memory_engine_test.go
+++ b/enginetest/memory_engine_test.go
@@ -41,6 +41,8 @@ type indexBehaviorTestParams struct {
 	nativeIndexes     bool
 }
 
+const SkipPreparedsCount = 91
+
 const testNumPartitions = 5
 
 var numPartitionsVals = []int{