diff --git a/common/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake
index 2d5efbbe68..7cebe51682 100644
--- a/common/cmake_modules/GncAddTest.cmake
+++ b/common/cmake_modules/GncAddTest.cmake
@@ -32,7 +32,7 @@ function(get_guile_env)
   list(APPEND env "GUILE=${GUILE_EXECUTABLE}")
 
   if (NOT WIN32)
-    list(APPEND env "GUILE_LOAD_COMPILED_PATH=${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}")
+    list(APPEND env "GUILE_LOAD_COMPILED_PATH=${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}:${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}/tests")
   endif()
   set(guile_load_paths "")
   list(APPEND guile_load_paths ${CMAKE_CURRENT_SOURCE_DIR}/mod-foo)
@@ -102,7 +102,7 @@ function(gnc_add_scheme_test _TARGET _SOURCE_FILE)
     set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
   endif()
   add_test(${_TARGET} ${CMAKE_COMMAND_TMP}
-    ${GUILE_EXECUTABLE} --debug -l ${CMAKE_CURRENT_SOURCE_DIR}/${_SOURCE_FILE} -c "(exit (run-test))"
+    ${GUILE_EXECUTABLE} --debug -c "(load-from-path \"${_TARGET}\")(exit (run-test))"
   )
   get_guile_env()
   set_tests_properties(${_TARGET} PROPERTIES ENVIRONMENT "${GUILE_ENV};${ARGN}")
diff --git a/gnucash/report/report-system/test/test-html-fonts.scm b/gnucash/report/report-system/test/test-html-fonts.scm
index bdb4d9099e..d136a1de2e 100644
--- a/gnucash/report/report-system/test/test-html-fonts.scm
+++ b/gnucash/report/report-system/test/test-html-fonts.scm
@@ -1,6 +1,6 @@
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
-(load "../html-fonts.scm")
+(load "html-fonts")
 
 (setlocale LC_ALL "C")
 
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index 081d8cacc2..503771f990 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -43,6 +43,12 @@ if (HAVE_SRFI64)
 
   gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}")
   if (HAVE_TEXT_PORTS)
+    gnc_add_scheme_test_targets(scm-test-reports-standard-tp
+      "${scm_test_with_textual_ports_SOURCES}"
+      "tests"
+      "${GUILE_DEPENDS};scm-srfi64-extras"
+      FALSE
+    )
     gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}")
   endif (HAVE_TEXT_PORTS)
 endif (HAVE_SRFI64)
diff --git a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
index e86921c16d..ddeefb7864 100644
--- a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
@@ -19,6 +19,13 @@ target_include_directories(gncmod-bar PRIVATE
   ${GUILE_INCLUDE_DIRS}
 )
 
+gnc_add_scheme_test_targets(scm-mod-bar
+  gnucash/bar.scm
+  "tests/gnucash"
+  gncmod-bar
+  FALSE
+  )
+
 set_target_properties(bar gncmod-bar PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
   ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
index 23b2dfad7b..f83fed30e0 100644
--- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
@@ -27,9 +27,9 @@ target_include_directories(gncmod-baz PRIVATE
 
 gnc_add_scheme_test_targets(scm-mod-baz
   gnucash/baz.scm
-  "tests"
+  "tests/gnucash"
   gncmod-baz
-  TRUE
+  FALSE
   )
 
 set_target_properties(baz gncmod-baz PROPERTIES
diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
index 5e05b1092e..c184eef7dd 100644
--- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
@@ -21,9 +21,9 @@ target_include_directories(gncmod-foo PRIVATE
 
 gnc_add_scheme_test_targets(scm-mod-foo
   gnucash/foo.scm
-  "tests"
+  "tests/gnucash"
   gncmod-foo
-  TRUE
+  FALSE
   )
 
 set_target_properties(foo gncmod-foo PROPERTIES