diff --git a/libgnucash/scm/CMakeLists.txt b/libgnucash/scm/CMakeLists.txt
index 021ab99cda..731e44a332 100644
--- a/libgnucash/scm/CMakeLists.txt
+++ b/libgnucash/scm/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(test)
+
 set(GUILE_DEPENDS      scm-core-utils scm-gnc-module)
 
 
@@ -17,6 +19,6 @@ gnc_add_scheme_targets(price-quotes
 
 
 set_local_dist(scm_DIST_local CMakeLists.txt utilities.scm price-quotes.scm)
-set(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} PARENT_SCOPE)
+set(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} ${test_scm_DIST} PARENT_SCOPE)
 
 
diff --git a/libgnucash/scm/test/CMakeLists.txt b/libgnucash/scm/test/CMakeLists.txt
new file mode 100644
index 0000000000..2e7a880c45
--- /dev/null
+++ b/libgnucash/scm/test/CMakeLists.txt
@@ -0,0 +1,29 @@
+set(scm_test_SCHEME
+  test-libgnucash-scm-utilities.scm
+  )
+
+set(GUILE_DEPENDS
+  scm-gnc-module
+  scm-app-utils
+  scm-scm scm-engine
+  )
+
+if (HAVE_SRFI64)
+  gnc_add_scheme_targets(scm-test-scm
+    "${scm_test_SCHEME}"
+    ""
+    "${GUILE_DEPENDS}"
+    FALSE
+    )
+
+  set(srfi64_extras_SCHEME_DIST
+    srfi64-extras.scm
+    )
+  gnc_add_scheme_tests("${scm_test_SCHEME}")
+
+endif (HAVE_SRFI64)
+
+set_dist_list(test_scm_DIST
+  CMakeLists.txt
+  ${scm_test_SCHEME}
+  )