diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06be03dea..1d2d1046e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,7 @@ jobs:
     env:
       SITENAME: GitHub Actions
       BASE_IMAGE: ${{matrix.base-image}}
+      STORAGE_TYPE: ${{matrix.storage}}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
diff --git a/.github/workflows/ctest_driver_script.cmake b/.github/workflows/ctest_driver_script.cmake
index 2678dedd6..b1f808445 100644
--- a/.github/workflows/ctest_driver_script.cmake
+++ b/.github/workflows/ctest_driver_script.cmake
@@ -18,6 +18,7 @@ ctest_empty_binary_directory("${CTEST_BINARY_DIRECTORY}")
 set(cfg_options
   "-DCDASH_DIR_NAME="
   "-DCDASH_SERVER=localhost:8080"
+  "-DCDASH_STORAGE_TYPE=${STORAGE_TYPE}"
 )
 
 # Backup .env file
diff --git a/.github/workflows/submit.sh b/.github/workflows/submit.sh
index e5e7d72b7..755e01058 100644
--- a/.github/workflows/submit.sh
+++ b/.github/workflows/submit.sh
@@ -14,6 +14,8 @@ submit_type="${submit_type:-Experimental}"
 
 site="${SITENAME:-$(hostname)}"
 
+storage_type="${STORAGE_TYPE:-local}"
+
 echo "site=$site"
 echo "database=$database"
 echo "ctest_driver=$ctest_driver"
@@ -40,6 +42,7 @@ docker exec cdash bash -c "\
     --schedule-random \
     -DSITENAME=\"${site}\" \
     -DDATABASE=\"${database}\" \
+    -DSTORAGE_TYPE=\"${storage_type}\" \
     -DSUBMIT_TYPE=\"${submit_type}\" \
     -S \"${ctest_driver}\" \
 "
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 527863051..129d2cdca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,9 @@ configure_file(
 # to configure the testing install
 set(CDASH_SERVER localhost CACHE STRING "CDash testing server")
 set(CDASH_IMAGE "$ENV{BASE_IMAGE}" CACHE STRING "Docker image name")
+if(NOT DEFINED CDASH_STORAGE_TYPE)
+  set(CDASH_STORAGE_TYPE "local")
+endif()
 
 get_filename_component(CDASH_DIR_NAME_DEFAULT ${CDash_SOURCE_DIR} NAME)
 set(CDASH_DIR_NAME "${CDASH_DIR_NAME_DEFAULT}" CACHE STRING "URL suffix. Ie 'http://<CDASH_SERVER>/<CDASH_DIR_NAME>'")
diff --git a/app/cdash/tests/CMakeLists.txt b/app/cdash/tests/CMakeLists.txt
index 19f8eb795..e624ffcc0 100644
--- a/app/cdash/tests/CMakeLists.txt
+++ b/app/cdash/tests/CMakeLists.txt
@@ -261,7 +261,10 @@ add_unit_test(/CDash/Messaging/Topic/TopicDecorator)
 set_tests_properties(/CDash/Messaging/Topic/TopicDecorator PROPERTIES DEPENDS /CDash/XmlHandler/UpdateHandler)
 
 add_laravel_test(/Feature/RemoteWorkers)
-set_tests_properties(/Feature/RemoteWorkers PROPERTIES DEPENDS /CDash/XmlHandler/UpdateHandler)
+set_tests_properties(/Feature/RemoteWorkers PROPERTIES
+    DEPENDS /CDash/XmlHandler/UpdateHandler
+    DISABLED "$<STREQUAL:${CDASH_STORAGE_TYPE},s3>"
+)
 
 add_laravel_test(/Feature/Jobs/NotifyExpiringAuthTokensTest)
 set_tests_properties(/Feature/Jobs/NotifyExpiringAuthTokensTest PROPERTIES RUN_SERIAL TRUE)