diff --git a/dlib/test/CMakeLists.txt b/dlib/test/CMakeLists.txt
index ac057981b..55c206a66 100644
--- a/dlib/test/CMakeLists.txt
+++ b/dlib/test/CMakeLists.txt
@@ -14,6 +14,139 @@ include(../cmake)
 # This variable contains a list of all the tests we are building
 # into the regression test suite.
 set (tests
+   example.cpp
+   active_learning.cpp
+   any.cpp
+   any_function.cpp
+   array2d.cpp
+   array.cpp
+   assignment_learning.cpp
+   base64.cpp
+   bayes_nets.cpp
+   bigint.cpp
+   binary_search_tree_kernel_1a.cpp
+   binary_search_tree_kernel_2a.cpp
+   binary_search_tree_mm1.cpp
+   binary_search_tree_mm2.cpp
+   bridge.cpp
+   bsp.cpp
+   byte_orderer.cpp
+   cca.cpp
+   clustering.cpp
+   cmd_line_parser.cpp
+   cmd_line_parser_wchar_t.cpp
+   compress_stream.cpp
+   conditioning_class_c.cpp
+   conditioning_class.cpp
+   config_reader.cpp
+   crc32.cpp
+   create_iris_datafile.cpp
+   data_io.cpp
+   directed_graph.cpp
+   discriminant_pca.cpp
+   disjoint_subsets.cpp
+   ekm_and_lisf.cpp
+   empirical_kernel_map.cpp
+   entropy_coder.cpp
+   entropy_encoder_model.cpp
+   example_args.cpp
+   face.cpp
+   fft.cpp
+   fhog.cpp
+   filtering.cpp
+   find_max_factor_graph_nmplp.cpp
+   find_max_factor_graph_viterbi.cpp
+   geometry.cpp
+   graph.cpp
+   graph_cuts.cpp
+   graph_labeler.cpp
+   hash.cpp
+   hash_map.cpp
+   hash_set.cpp
+   hash_table.cpp
+   hog_image.cpp
+   image.cpp
+   iosockstream.cpp
+   is_same_object.cpp
+   kcentroid.cpp
+   kernel_matrix.cpp
+   kmeans.cpp
+   learning_to_track.cpp
+   least_squares.cpp
+   linear_manifold_regularizer.cpp
+   lspi.cpp
+   lz77_buffer.cpp
+   map.cpp
+   matrix2.cpp
+   matrix3.cpp
+   matrix4.cpp
+   matrix_chol.cpp
+   matrix.cpp
+   matrix_eig.cpp
+   matrix_lu.cpp
+   matrix_qr.cpp
+   max_cost_assignment.cpp
+   max_sum_submatrix.cpp
+   md5.cpp
+   member_function_pointer.cpp
+   metaprogramming.cpp
+   mpc.cpp
+   multithreaded_object.cpp
+   numerical_integration.cpp
+   object_detector.cpp
+   oca.cpp
+   one_vs_all_trainer.cpp
+   one_vs_one_trainer.cpp
+   optimization.cpp
+   optimization_test_functions.cpp
+   opt_qp_solver.cpp
+   parallel_for.cpp
+   parse.cpp
+   pipe.cpp
+   pixel.cpp
+   probabilistic.cpp
+   pyramid_down.cpp
+   queue.cpp
+   rand.cpp
+   ranking.cpp
+   read_write_mutex.cpp
+   reference_counter.cpp
+   rls.cpp
+   sammon.cpp
+   scan_image.cpp
+   sequence.cpp
+   sequence_labeler.cpp
+   sequence_segmenter.cpp
+   serialize.cpp
+   set.cpp
+   sldf.cpp
+   sliding_buffer.cpp
+   smart_pointers.cpp
+   sockets2.cpp
+   sockets.cpp
+   sockstreambuf.cpp
+   sparse_vector.cpp
+   stack.cpp
+   static_map.cpp
+   static_set.cpp
+   statistics.cpp
+   std_vector_c.cpp
+   string.cpp
+   svm_c_linear.cpp
+   svm_c_linear_dcd.cpp
+   svm.cpp
+   svm_multiclass_linear.cpp
+   svm_struct.cpp
+   svr_linear_trainer.cpp
+   symmetric_matrix_cache.cpp
+   thread_pool.cpp
+   threads.cpp
+   timer.cpp
+   tokenizer.cpp
+   trust_region.cpp
+   tuple.cpp
+   type_safe_union.cpp
+   vectorstream.cpp
    )
 
 # Tests that require C++11 support
@@ -38,3 +171,9 @@ endif()
 TARGET_LINK_LIBRARIES(${target_name} dlib )
 
 
+if (NOT DLIB_NO_GUI_SUPPORT)
+   add_subdirectory(gui)
+   add_subdirectory(examples)
+endif()
+
+