diff --git a/.github/workflows/linux-bionic-5.9.yml b/.github/workflows/linux-bionic-5.9.yml
index bdfb71600..fe17c47a3 100644
--- a/.github/workflows/linux-bionic-5.9.yml
+++ b/.github/workflows/linux-bionic-5.9.yml
@@ -41,5 +41,6 @@ jobs:
         # and now run the tests - with Qt 5.9 we can only run the desktop flavor
         echo "------------------------------------"
         echo "run tests"
-        cd build
+        cd build/tests
+        xvfb-run --auto-servernum ./TestGitStorage -v2
         xvfb-run --auto-servernum make check
diff --git a/.github/workflows/linux-eoan-5.12.yml b/.github/workflows/linux-eoan-5.12.yml
index 68be79ce3..be60de01e 100644
--- a/.github/workflows/linux-eoan-5.12.yml
+++ b/.github/workflows/linux-eoan-5.12.yml
@@ -48,7 +48,8 @@ jobs:
         echo "--------------------------------------------------------------"
         echo "running tests for mobile"
 
-        cd build-mobile
+        cd build-mobile/tests
+        xvfb-run --auto-servernum ./TestGitStorage -v2
         xvfb-run --auto-servernum make check
 
     - name: build Subsurface
@@ -64,6 +65,7 @@ jobs:
       run: |
         echo "--------------------------------------------------------------"
         echo "running tests for desktop"
-        cd build
+        cd build/tests
+        xvfb-run --auto-servernum ./TestGitStorage -v2
         xvfb-run --auto-servernum make check
 
diff --git a/.github/workflows/linux-groovy-5.14.yml b/.github/workflows/linux-groovy-5.14.yml
index f79467262..29da8bb17 100644
--- a/.github/workflows/linux-groovy-5.14.yml
+++ b/.github/workflows/linux-groovy-5.14.yml
@@ -48,7 +48,8 @@ jobs:
         echo "--------------------------------------------------------------"
         echo "running tests for mobile"
 
-        cd build-mobile
+        cd build-mobile/tests
+        xvfb-run --auto-servernum ./TestGitStorage -v2
         xvfb-run --auto-servernum make check
 
     - name: build Subsurface
@@ -64,6 +65,7 @@ jobs:
       run: |
         echo "--------------------------------------------------------------"
         echo "running tests for desktop"
-        cd build
+        cd build/tests
+        xvfb-run --auto-servernum ./TestGitStorage -v2
         xvfb-run --auto-servernum make check
 
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index af1a5d539..2a330c6d0 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -39,6 +39,7 @@ jobs:
         export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
         export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
         cd ${GITHUB_WORKSPACE}/build-mobile/tests
+        ./TestGitStorage -v2
         make check
 
     - name: build Subsurface
@@ -65,5 +66,6 @@ jobs:
         export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
         export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
         cd ${GITHUB_WORKSPACE}/build/tests
+        ./TestGitStorage -v2
         make check
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c8b38694c..d89b47e8c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -50,6 +50,9 @@ endif()
 
 # Helper function TEST used to created rules to build, link, install and run tests
 function(TEST NAME FILE)
+	if(DEFINED ARGV2)
+		set(CFGARG "CONFIGURATIONS" ${ARGV2})
+	endif()
 	get_filename_component(HDR "${FILE}" NAME_WE)
 	add_executable(${NAME} ${FILE} ${HDR}.h)
 	target_link_libraries(
@@ -70,7 +73,7 @@ function(TEST NAME FILE)
 		# Run test using wine
 		if(WINE_PROGRAM)
 			add_test(
-				NAME ${NAME}
+				NAME ${NAME} ${CFGARG}
 				COMMAND "$<TARGET_FILE:${NAME}>"
 				WORKING_DIRECTORY ${WINDOWS_STAGING_TESTS}
 				)
@@ -80,7 +83,7 @@ function(TEST NAME FILE)
 			set_tests_properties(${NAME} PROPERTIES DEPENDS PrepareTests)
 		endif()
 	else()
-		add_test(NAME ${NAME} COMMAND  $<TARGET_FILE:${NAME}>)
+		add_test(NAME ${NAME} ${CFGARG} COMMAND  $<TARGET_FILE:${NAME}>)
 	endif()
 endfunction()
 
@@ -112,7 +115,7 @@ TEST(TestDiveSiteDuplication testdivesiteduplication.cpp)
 TEST(TestRenumber testrenumber.cpp)
 # this keeps randomly failing and I don't understand why
 # too many false positives, so disabling this test for now
-TEST(TestGitStorage testgitstorage.cpp)
+TEST(TestGitStorage testgitstorage.cpp storageconfig)
 TEST(TestPicture testpicture.cpp)
 TEST(TestMerge testmerge.cpp)
 TEST(TestTagList testtaglist.cpp)
@@ -150,7 +153,6 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
 	TestProfile
 	TestGpsCoords
 	TestParse
-	# TestGitStorage
 	TestPlan
 	TestAirPressure
 	TestDiveSiteDuplication