diff --git a/gnucash/import-export/test/CMakeLists.txt b/gnucash/import-export/test/CMakeLists.txt
index 0eae7bffe6..93447f8ba1 100644
--- a/gnucash/import-export/test/CMakeLists.txt
+++ b/gnucash/import-export/test/CMakeLists.txt
@@ -34,10 +34,6 @@ set(IMPORT_ACCOUNT_MATCHER_TEST_LIBS gnc-generic-import gnc-engine test-core gte
 gnc_add_test(test-import-account-matcher gtest-import-account-matcher.cpp
   IMPORT_ACCOUNT_MATCHER_TEST_INCLUDE_DIRS IMPORT_ACCOUNT_MATCHER_TEST_LIBS)
 
-set_dist_list(test_generic_import_DIST CMakeLists.txt
-  test-import-parse.c test-import-pending-matches.cpp
-  gtest-import-account-matcher.cpp)
-
 set(gtest_import_backend_INCLUDE_DIRS
   ${CMAKE_BINARY_DIR}/common # for config.h
   ${CMAKE_SOURCE_DIR}/common
@@ -85,3 +81,9 @@ set(gtest_import_backend_SOURCES
 gnc_add_test(test-import-backend "${gtest_import_backend_SOURCES}"
   gtest_import_backend_INCLUDE_DIRS gtest_import_backend_LIBS)
 
+set_dist_list(test_generic_import_DIST
+    CMakeLists.txt
+    test-import-parse.c
+    test-import-pending-matches.cpp
+    gtest-import-account-matcher.cpp
+    gtest-import-backend.cpp)
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index e53df54d95..4cfa65a35c 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -1,5 +1,6 @@
 # NB: Unit tests which require GSchemas should be made conditional on COMPILE_GSCHEMAS.
 add_subdirectory(test)
+add_subdirectory(mocks)
 # Build the library
 
 set (app_utils_noinst_HEADERS
@@ -198,4 +199,8 @@ add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-2 scm-app-utils-1)
 set_local_dist(app_utils_DIST_local
         ${app_utils_ALL_SOURCES} ${app_utils_SCHEME_1} ${app_utils_SCHEME_2} ${app_utils_SCHEME_3}
         app-utils.i CMakeLists.txt gnc-help-utils.c)
-set(app_utils_DIST ${app_utils_DIST_local} ${test_app_utils_DIST} PARENT_SCOPE)
+set(app_utils_DIST
+    ${app_utils_DIST_local}
+    ${test_app_utils_DIST}
+    ${app_utils_mocks_DIST}
+    PARENT_SCOPE)
diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
index a63efbe63d..14a2420331 100644
--- a/libgnucash/engine/CMakeLists.txt
+++ b/libgnucash/engine/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 add_subdirectory(test-core)
 add_subdirectory(test)
+add_subdirectory(mocks)
 
 set(engine_noinst_HEADERS
   AccountP.h
@@ -267,4 +268,8 @@ if (NOT WIN32)
 endif()
 set_local_dist(engine_DIST_local CMakeLists.txt ${engine_SOURCES} ${engine_HEADERS}
                      ${engine_noinst_HEADERS} ${engine_EXTRA_DIST})
-set(engine_DIST ${engine_DIST_local} ${engine_test_core_DIST} ${test_engine_DIST} PARENT_SCOPE)
+set(engine_DIST
+    ${engine_DIST_local}
+    ${engine_test_core_DIST}
+    ${test_engine_DIST}
+    ${engine_mocks_DIST} PARENT_SCOPE)