diff --git a/ci/run_ci.sh b/ci/run_ci.sh
index 200cfd61b..b62f78a88 100755
--- a/ci/run_ci.sh
+++ b/ci/run_ci.sh
@@ -61,7 +61,7 @@ module use $GDAS_MODULE_USE
 module load GDAS/$TARGET
 echo "---------------------------------------------------" >> $outfile
 rm -rf log.ctest
-ctest -R gdasapp --output-on-failure &>> log.ctest
+ctest -E "manual" -R gdasapp --output-on-failure &>> log.ctest
 ctest_status=$?
 npassed=$(cat log.ctest | grep "tests passed")
 if [ $ctest_status -eq 0 ]; then
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 86b53a3f1..c045655b4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -134,19 +134,11 @@ if (WORKFLOW_TESTS)
            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/testrun)
 endif()
 
-# fv3jedi tests
 if (${BUILD_GDASBUNDLE})
-  add_subdirectory(fv3jedi)
-endif()
-
-# soca tests
-if (${BUILD_GDASBUNDLE})
-  add_subdirectory(soca)
-endif()
-
-# snow da tests
-if (${BUILD_GDASBUNDLE})
-  add_subdirectory(snow)
+  add_subdirectory(fv3jedi)   # fv3jedi tests
+  add_subdirectory(soca)      # soca tests
+  add_subdirectory(snow)      # snow da tests
+  add_subdirectory(gw-ci)     # replicate the creation of some of the gw-ci tests
 endif()
 
 # gdas atm tests
diff --git a/test/gw-ci/CMakeLists.txt b/test/gw-ci/CMakeLists.txt
new file mode 100644
index 000000000..60aca9832
--- /dev/null
+++ b/test/gw-ci/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Setup the environement
+set(HOMEgfs ${CMAKE_SOURCE_DIR}/../../..)
+set(RUNTESTS ${CMAKE_CURRENT_BINARY_DIR}/../../test/gw-ci)
+
+# List of g-w ci test to create
+set(cycling_tests "C48mx500_3DVarAOWCDA" "C96_atmaerosnowDA" "C96C48_ufs_hybatmDA")
+
+# Prepare the cycling ctests
+foreach(pslot ${cycling_tests})
+  set(YAML ${HOMEgfs}/ci/cases/pr/${pslot}.yaml)
+  add_test(NAME ${pslot}
+           COMMAND /bin/bash -c "${PROJECT_SOURCE_DIR}/test/gw-ci/create_exp.sh ${YAML} ${pslot} ${HOMEgfs} ${RUNTESTS}"
+           WORKING_DIRECTORY ${RUNTESTS})
+  set_tests_properties(${pslot} PROPERTIES LABELS "manual")
+endforeach()
diff --git a/test/gw-ci/create_exp.sh b/test/gw-ci/create_exp.sh
new file mode 100755
index 000000000..4a6d2b34e
--- /dev/null
+++ b/test/gw-ci/create_exp.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+expyaml="$1"
+export pslot="$2"
+HOMEgfs="$3"
+export RUNTESTS="$4"/${pslot}
+export SLURM_ACCOUNT="da-cpu"
+
+# Get ICSDIR_ROOT
+source "${HOMEgfs}/ush/detect_machine.sh"
+source "${HOMEgfs}/ci/platforms/config.${MACHINE_ID}"
+
+# Source the gw environement
+source ${HOMEgfs}/workflow/gw_setup.sh
+
+# Create the experiment
+${HOMEgfs}/workflow/create_experiment.py --yaml ${expyaml} --overwrite
diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt
index 38cea0d23..b6c64f381 100644
--- a/test/soca/gw/CMakeLists.txt
+++ b/test/soca/gw/CMakeLists.txt
@@ -48,9 +48,11 @@ set(jjob_list "JGLOBAL_PREP_OCEAN_OBS"
               "JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN"
 #	      "JGDAS_GLOBAL_OCEAN_ANALYSIS_LETKF"
               "JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT"
-              "JGDAS_GLOBAL_OCEAN_ANALYSIS_POST")
+# TODO(WaterPeople) Add back when g-w PR2584 is merged
+#              "JGDAS_GLOBAL_OCEAN_ANALYSIS_POST")
 # TODO(WaterPeople) Add back to the list of tested jobs once fixed
 #              "JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY")
+)
 
 set(setup "")
 foreach(jjob ${jjob_list})