diff --git a/build/cmake/tests/base/CMakeLists.txt b/build/cmake/tests/base/CMakeLists.txt
index 25f614e885..0b412b567c 100644
--- a/build/cmake/tests/base/CMakeLists.txt
+++ b/build/cmake/tests/base/CMakeLists.txt
@@ -56,7 +56,6 @@ set(TEST_SRC
     regex/wxregextest.cpp
     scopeguard/scopeguardtest.cpp
     strings/iostream.cpp
-    strings/hexconv.cpp
     strings/numformatter.cpp
     strings/strings.cpp
     strings/stdstrings.cpp
@@ -66,12 +65,14 @@ set(TEST_SRC
     strings/vararg.cpp
     strings/crt.cpp
     strings/vsnprintf.cpp
+    strings/hexconv.cpp
     streams/datastreamtest.cpp
     streams/ffilestream.cpp
     streams/fileback.cpp
     streams/filestream.cpp
     streams/iostreams.cpp
     streams/largefile.cpp
+    streams/lzmastream.cpp
     streams/memstream.cpp
     streams/socketstream.cpp
     streams/sstream.cpp
diff --git a/build/cmake/tests/gui/CMakeLists.txt b/build/cmake/tests/gui/CMakeLists.txt
index 9394ce3710..9043048348 100644
--- a/build/cmake/tests/gui/CMakeLists.txt
+++ b/build/cmake/tests/gui/CMakeLists.txt
@@ -23,6 +23,7 @@ set(TEST_GUI_SRC
     graphics/boundingbox.cpp
     graphics/clippingbox.cpp
     graphics/graphmatrix.cpp
+    graphics/graphpath.cpp
     config/config.cpp
     controls/bitmapcomboboxtest.cpp
     controls/bitmaptogglebuttontest.cpp
@@ -86,6 +87,7 @@ set(TEST_GUI_SRC
     image/rawbmp.cpp
     html/htmlparser.cpp
     html/htmlwindow.cpp
+    html/htmprint.cpp
     menu/accelentry.cpp
     menu/menu.cpp
     misc/guifuncs.cpp
@@ -97,6 +99,8 @@ set(TEST_GUI_SRC
     # non-GUI test) as sockets behave differently in console and GUI
     # applications.
     net/socket.cpp
+    persistence/tlw.cpp
+    persistence/dataview.cpp
     sizers/boxsizer.cpp
     sizers/gridsizer.cpp
     sizers/wrapsizer.cpp