diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 0dd06b8e4..7bda63c2f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -17,7 +17,7 @@ jobs:
         run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=--coverage
 
       - name: Build project
-        run: cmake --build build --target build_tests
+        run: cmake --build build --target test_runner --target task_executable
 
       - name: Test project
         run: ctest --test-dir build -j 8 --output-on-failure
diff --git a/Cargo.lock b/Cargo.lock
index 100bc047d..a98e23563 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1141,6 +1141,21 @@ dependencies = [
  "sct",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.6",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -1807,6 +1822,15 @@ dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
diff --git a/doc/devel/contrib/development.md b/doc/devel/contrib/development.md
index 0301eea07..0c9ae90bb 100644
--- a/doc/devel/contrib/development.md
+++ b/doc/devel/contrib/development.md
@@ -52,9 +52,9 @@ cmake --build build-clang
 ## Run the Test Suite:
 For running the test suite [ctest](https://cmake.org/cmake/help/latest/manual/ctest.1.html) is used.
 Before one can run the test suite the `task_executable` must be built.
-After that also the `build_tests` target must be build, which can be done over:
+After that also the `test_runner` target must be build, which can be done over:
 ```sh
-cmake --build build --target build_tests
+cmake --build build --target test_runner
 ```
 Again you may also use the `-j <number-of-jobs>` option for parallel builds.
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d8de86d9f..b6813661e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required (VERSION 3.22)
 
+# -- C++ tests
+
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
@@ -8,56 +10,64 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS
-  col.test.cpp
-  dom.test.cpp
-  eval.test.cpp
-  lexer.test.cpp
-  t.test.cpp
-  tw-2689.test.cpp
-  tdb2.test.cpp
-  tc.test.cpp
-  util.test.cpp
-  variant_add.test.cpp
-  variant_and.test.cpp
-  variant_cast.test.cpp
-  variant_divide.test.cpp
-  variant_equal.test.cpp
-  variant_exp.test.cpp
-  variant_gt.test.cpp
-  variant_gte.test.cpp
-  variant_inequal.test.cpp
-  variant_lt.test.cpp
-  variant_lte.test.cpp
-  variant_match.test.cpp
-  variant_math.test.cpp
-  variant_modulo.test.cpp
-  variant_multiply.test.cpp
-  variant_nomatch.test.cpp
-  variant_not.test.cpp
-  variant_or.test.cpp
-  variant_partial.test.cpp
-  variant_subtract.test.cpp
-  variant_xor.test.cpp
-  view.test.cpp
+# All C++ test files. Note that the portion before `.cpp` must be a valid,
+# unique C++ identifier.
+set(test_SRCS
+  col_test.cpp
+  dom_test.cpp
+  eval_test.cpp
+  lexer_test.cpp
+  t_test.cpp
+  tw_2689_test.cpp
+  tdb2_test.cpp
+  tc_cpp_test.cpp
+  util_test.cpp
+  variant_add_test.cpp
+  variant_and_test.cpp
+  variant_cast_test.cpp
+  variant_divide_test.cpp
+  variant_equal_test.cpp
+  variant_exp_test.cpp
+  variant_gt_test.cpp
+  variant_gte_test.cpp
+  variant_inequal_test.cpp
+  variant_lt_test.cpp
+  variant_lte_test.cpp
+  variant_match_test.cpp
+  variant_math_test.cpp
+  variant_modulo_test.cpp
+  variant_multiply_test.cpp
+  variant_nomatch_test.cpp
+  variant_not_test.cpp
+  variant_or_test.cpp
+  variant_partial_test.cpp
+  variant_subtract_test.cpp
+  variant_xor_test.cpp
+  view_test.cpp
   )
 
-add_custom_target (build_tests DEPENDS ${test_SRCS}
-                               WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test)
+# Build `test_runner` containing all CPP tests, linked once.
+create_test_sourcelist (cpp_test_SRCS cpp_tests.cpp ${test_SRCS})
+add_executable(test_runner
+  test.cpp
+  ${cpp_test_SRCS}
+)
+target_link_libraries (test_runner task commands columns libshared task commands columns libshared task commands columns libshared ${TASK_LIBRARIES})
+if (DARWIN)
+  target_link_libraries (test_runner "-framework CoreFoundation -framework Security -framework SystemConfiguration")
+endif (DARWIN)
 
-foreach (src_FILE ${test_SRCS})
-  add_executable (${src_FILE} ${src_FILE} test.cpp)
-  target_link_libraries (${src_FILE} task commands columns libshared task commands columns libshared task commands columns libshared ${TASK_LIBRARIES})
-  add_dependencies (${src_FILE} task_executable)
-  if (DARWIN)
-    target_link_libraries (${src_FILE} "-framework CoreFoundation -framework Security -framework SystemConfiguration")
-  endif (DARWIN)
-
-  add_test(NAME ${src_FILE}
-    COMMAND ${src_FILE}
+foreach (test_FILE ${test_SRCS})
+  get_filename_component (test_NAME ${test_FILE} NAME_WE)
+  # Tell the source file what its own name is
+  set_source_files_properties(${test_FILE} PROPERTIES COMPILE_FLAGS -DTEST_NAME=${test_NAME})
+  add_test(NAME ${test_FILE}
+    COMMAND test_runner ${test_NAME}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    )
-endforeach (src_FILE)
+  )
+endforeach (test_FILE)
+
+# -- Python tests
 
 add_subdirectory(basetest)
 add_subdirectory(simpletap)
diff --git a/test/README.md b/test/README.md
index eafc2d956..e00621ffc 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,7 +1,7 @@
 ## Running Tests
 Do this to run all tests:
 ```shell
-cmake --build build --target build_tests
+cmake --build build --target test_runner --target task_executable
 ctest --test-dir build
 ```
 
diff --git a/test/col.test.cpp b/test/col_test.cpp
similarity index 99%
rename from test/col.test.cpp
rename to test/col_test.cpp
index 0e7d8290b..d2ffd378c 100644
--- a/test/col.test.cpp
+++ b/test/col_test.cpp
@@ -33,7 +33,7 @@
 #include <test.h>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest test(12);
 
   // Ensure environment has no influence.
diff --git a/test/docker/arch b/test/docker/arch
index e4ef88b81..1f01e38b1 100644
--- a/test/docker/arch
+++ b/test/docker/arch
@@ -26,5 +26,5 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-RUN cmake --build build --target build_tests -j 8
+RUN cmake --build build --target test_runner -j 8
 CMD ctest --test-dir build -j 8 --output-on-failure --rerun-failed
diff --git a/test/docker/debianstable b/test/docker/debianstable
index 94e75a604..fc31168c6 100644
--- a/test/docker/debianstable
+++ b/test/docker/debianstable
@@ -27,5 +27,5 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-RUN cmake --build build --target build_tests -j 8
+RUN cmake --build build --target test_runner -j 8
 CMD ctest --test-dir build -j 8 --output-on-failure --rerun-failed
diff --git a/test/docker/debiantesting b/test/docker/debiantesting
index 9d11a619c..dbf886149 100644
--- a/test/docker/debiantesting
+++ b/test/docker/debiantesting
@@ -27,5 +27,5 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-RUN cmake --build build --target build_tests -j 8
+RUN cmake --build build --target test_runner -j 8
 CMD ctest --test-dir build -j 8 --output-on-failure --rerun-failed
diff --git a/test/docker/fedora39 b/test/docker/fedora39
index 02659a415..f4aa357a0 100644
--- a/test/docker/fedora39
+++ b/test/docker/fedora39
@@ -26,5 +26,5 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-RUN cmake --build build --target build_tests -j 8
+RUN cmake --build build --target test_runner -j 8
 CMD ctest --test-dir build -j 8 --output-on-failure --rerun-failed
diff --git a/test/docker/fedora40 b/test/docker/fedora40
index 0574356a3..8dfc23dd3 100644
--- a/test/docker/fedora40
+++ b/test/docker/fedora40
@@ -26,5 +26,5 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-RUN cmake --build build --target build_tests -j 8
+RUN cmake --build build --target test_runner -j 8
 CMD ctest --test-dir build -j 8 --output-on-failure --rerun-failed
diff --git a/test/docker/opensuse b/test/docker/opensuse
index 6ea38d4f0..cff676ef1 100644
--- a/test/docker/opensuse
+++ b/test/docker/opensuse
@@ -25,5 +25,5 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-RUN cmake --build build --target build_tests -j 8
+RUN cmake --build build --target test_runner -j 8
 CMD ctest --test-dir build -j 8 --output-on-failure --rerun-failed
diff --git a/test/docker/ubuntu2004 b/test/docker/ubuntu2004
index ea11d1f59..dd0ec6f57 100644
--- a/test/docker/ubuntu2004
+++ b/test/docker/ubuntu2004
@@ -34,5 +34,5 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-RUN cmake --build build --target build_tests -j 8
+RUN cmake --build build --target test_runner -j 8
 CMD ctest --test-dir build -j 8 --output-on-failure --rerun-failed
diff --git a/test/docker/ubuntu2204 b/test/docker/ubuntu2204
index 110547ade..c1c3f6aef 100644
--- a/test/docker/ubuntu2204
+++ b/test/docker/ubuntu2204
@@ -27,5 +27,5 @@ RUN cmake --install build
 RUN task --version
 
 # Setup tests
-RUN cmake --build build --target build_tests -j 8
+RUN cmake --build build --target test_runner -j 8
 CMD ctest --test-dir build -j 8 --output-on-failure --rerun-failed
diff --git a/test/dom.test.cpp b/test/dom_test.cpp
similarity index 98%
rename from test/dom.test.cpp
rename to test/dom_test.cpp
index 2a031e835..f542b3e30 100644
--- a/test/dom.test.cpp
+++ b/test/dom_test.cpp
@@ -31,6 +31,8 @@
 #include <Variant.h>
 #include <test.h>
 
+namespace {
+
 ////////////////////////////////////////////////////////////////////////////////
 bool providerString(const std::string& path, Variant& var) {
   if (path == "name") {
@@ -50,8 +52,10 @@ bool providerString(const std::string& path, Variant& var) {
   return false;
 }
 
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(12);
 
   DOM dom;
diff --git a/test/eval.test.cpp b/test/eval_test.cpp
similarity index 99%
rename from test/eval.test.cpp
rename to test/eval_test.cpp
index 3875da5ac..e55d612a2 100644
--- a/test/eval.test.cpp
+++ b/test/eval_test.cpp
@@ -31,6 +31,8 @@
 #include <Eval.h>
 #include <test.h>
 
+namespace {
+
 ////////////////////////////////////////////////////////////////////////////////
 // A few hard-coded symbols.
 bool get(const std::string& name, Variant& value) {
@@ -42,8 +44,10 @@ bool get(const std::string& name, Variant& value) {
   return true;
 }
 
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(52);
   Context context;
   Context::setContext(&context);
diff --git a/test/lexer.test.cpp b/test/lexer_test.cpp
similarity index 99%
rename from test/lexer.test.cpp
rename to test/lexer_test.cpp
index cac825f17..715c46081 100644
--- a/test/lexer.test.cpp
+++ b/test/lexer_test.cpp
@@ -37,7 +37,7 @@
 #include <vector>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
 #ifdef PRODUCT_TASKWARRIOR
   UnitTest t(1255);
 #else
diff --git a/test/t.test.cpp b/test/t_test.cpp
similarity index 99%
rename from test/t.test.cpp
rename to test/t_test.cpp
index d56015263..a7063b19f 100644
--- a/test/t.test.cpp
+++ b/test/t_test.cpp
@@ -32,7 +32,7 @@
 #include <test.h>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest test(48);
   Context context;
   Context::setContext(&context);
diff --git a/test/tc.test.cpp b/test/tc_cpp_test.cpp
similarity index 99%
rename from test/tc.test.cpp
rename to test/tc_cpp_test.cpp
index 747c8e628..c92e5e66d 100644
--- a/test/tc.test.cpp
+++ b/test/tc_cpp_test.cpp
@@ -41,7 +41,7 @@ std::string uuid2str(tc::Uuid uuid) { return static_cast<std::string>(uuid.to_st
 // Tests for the basic cxxbridge functionality. This focuses on the methods with
 // complex cxxbridge implementations, rather than those with complex Rust
 // implementations but simple APIs, like sync.
-int main(int, char **) {
+int TEST_NAME(int, char **) {
   UnitTest t;
   std::string str;
 
diff --git a/test/tdb2.test.cpp b/test/tdb2_test.cpp
similarity index 98%
rename from test/tdb2.test.cpp
rename to test/tdb2_test.cpp
index e9a0b1508..22134d250 100644
--- a/test/tdb2.test.cpp
+++ b/test/tdb2_test.cpp
@@ -34,7 +34,7 @@
 
 #include <iostream>
 
-Context context;
+namespace {
 
 void cleardb() {
   // Remove any residual test files.
@@ -42,8 +42,10 @@ void cleardb() {
   unlink("./taskchampion.sqlite3");
 }
 
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(12);
   Context context;
   Context::setContext(&context);
diff --git a/test/tw-2689.test.cpp b/test/tw_2689_test.cpp
similarity index 99%
rename from test/tw-2689.test.cpp
rename to test/tw_2689_test.cpp
index 14f95a784..cbbad40f1 100644
--- a/test/tw-2689.test.cpp
+++ b/test/tw_2689_test.cpp
@@ -34,7 +34,7 @@
 #include <test.h>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest test(12);
 
   // Ensure environment has no influence.
diff --git a/test/util.test.cpp b/test/util_test.cpp
similarity index 99%
rename from test/util.test.cpp
rename to test/util_test.cpp
index a627c16a9..c4cf4e0bd 100644
--- a/test/util.test.cpp
+++ b/test/util_test.cpp
@@ -35,7 +35,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(19);
   Context context;
   Context::setContext(&context);
diff --git a/test/variant_add.test.cpp b/test/variant_add_test.cpp
similarity index 99%
rename from test/variant_add.test.cpp
rename to test/variant_add_test.cpp
index 1cbd1eb92..b17a3812c 100644
--- a/test/variant_add.test.cpp
+++ b/test/variant_add_test.cpp
@@ -35,7 +35,7 @@
 #define EPSILON 0.001
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(80);
 
   Variant v0(true);
diff --git a/test/variant_and.test.cpp b/test/variant_and_test.cpp
similarity index 99%
rename from test/variant_and.test.cpp
rename to test/variant_and_test.cpp
index 78267656b..97196ea78 100644
--- a/test/variant_and.test.cpp
+++ b/test/variant_and_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(76);
 
   Variant v0(true);
diff --git a/test/variant_cast.test.cpp b/test/variant_cast_test.cpp
similarity index 99%
rename from test/variant_cast.test.cpp
rename to test/variant_cast_test.cpp
index e93a82ac6..327881dc0 100644
--- a/test/variant_cast.test.cpp
+++ b/test/variant_cast_test.cpp
@@ -35,7 +35,7 @@
 #define EPSILON 0.001
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(81);
 
   time_t now = time(nullptr);
diff --git a/test/variant_divide.test.cpp b/test/variant_divide_test.cpp
similarity index 99%
rename from test/variant_divide.test.cpp
rename to test/variant_divide_test.cpp
index a42c61664..c1df0c158 100644
--- a/test/variant_divide.test.cpp
+++ b/test/variant_divide_test.cpp
@@ -35,7 +35,7 @@
 #define EPSILON 0.0001
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(44);
 
   Variant v0(true);
diff --git a/test/variant_equal.test.cpp b/test/variant_equal_test.cpp
similarity index 99%
rename from test/variant_equal.test.cpp
rename to test/variant_equal_test.cpp
index f09f9a28d..2383c6e96 100644
--- a/test/variant_equal.test.cpp
+++ b/test/variant_equal_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(72);
 
   Variant v0(true);
diff --git a/test/variant_exp.test.cpp b/test/variant_exp_test.cpp
similarity index 99%
rename from test/variant_exp.test.cpp
rename to test/variant_exp_test.cpp
index 20fec4fd2..00fd48121 100644
--- a/test/variant_exp.test.cpp
+++ b/test/variant_exp_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(38);
 
   Variant v0(true);
diff --git a/test/variant_gt.test.cpp b/test/variant_gt_test.cpp
similarity index 99%
rename from test/variant_gt.test.cpp
rename to test/variant_gt_test.cpp
index a35f3cef4..2abab3add 100644
--- a/test/variant_gt.test.cpp
+++ b/test/variant_gt_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(72);
 
   Variant v0(true);
diff --git a/test/variant_gte.test.cpp b/test/variant_gte_test.cpp
similarity index 99%
rename from test/variant_gte.test.cpp
rename to test/variant_gte_test.cpp
index 6da52047e..4dbfa8f8e 100644
--- a/test/variant_gte.test.cpp
+++ b/test/variant_gte_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(72);
 
   Variant v0(true);
diff --git a/test/variant_inequal.test.cpp b/test/variant_inequal_test.cpp
similarity index 99%
rename from test/variant_inequal.test.cpp
rename to test/variant_inequal_test.cpp
index eb1dc0b20..29222899b 100644
--- a/test/variant_inequal.test.cpp
+++ b/test/variant_inequal_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(72);
 
   Variant v0(true);
diff --git a/test/variant_lt.test.cpp b/test/variant_lt_test.cpp
similarity index 99%
rename from test/variant_lt.test.cpp
rename to test/variant_lt_test.cpp
index f5ae1331c..80967edd5 100644
--- a/test/variant_lt.test.cpp
+++ b/test/variant_lt_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(72);
 
   Variant v0(true);
diff --git a/test/variant_lte.test.cpp b/test/variant_lte_test.cpp
similarity index 99%
rename from test/variant_lte.test.cpp
rename to test/variant_lte_test.cpp
index 4b2eaba9a..f68d4bf8a 100644
--- a/test/variant_lte.test.cpp
+++ b/test/variant_lte_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(72);
 
   Variant v0(true);
diff --git a/test/variant_match.test.cpp b/test/variant_match_test.cpp
similarity index 99%
rename from test/variant_match.test.cpp
rename to test/variant_match_test.cpp
index 2777eb551..879adc8d3 100644
--- a/test/variant_match.test.cpp
+++ b/test/variant_match_test.cpp
@@ -33,12 +33,12 @@
 
 #include <iostream>
 
-Task task;
-
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(120);
 
+  Task task;
+
   Variant vs0("untrue");   // ~ true
   Variant vs1(8421);       // ~ 42
   Variant vs2(3.14159);    // ~ 3.14
diff --git a/test/variant_math.test.cpp b/test/variant_math_test.cpp
similarity index 98%
rename from test/variant_math.test.cpp
rename to test/variant_math_test.cpp
index 417a13adc..46b4dc10f 100644
--- a/test/variant_math.test.cpp
+++ b/test/variant_math_test.cpp
@@ -35,7 +35,7 @@
 #define EPSILON 0.001
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(1);
 
   Variant v0(10.0);
diff --git a/test/variant_modulo.test.cpp b/test/variant_modulo_test.cpp
similarity index 99%
rename from test/variant_modulo.test.cpp
rename to test/variant_modulo_test.cpp
index 90a6da82c..39ef6a2b6 100644
--- a/test/variant_modulo.test.cpp
+++ b/test/variant_modulo_test.cpp
@@ -35,7 +35,7 @@
 #define EPSILON 0.0001
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(40);
 
   Variant v0(true);
diff --git a/test/variant_multiply.test.cpp b/test/variant_multiply_test.cpp
similarity index 99%
rename from test/variant_multiply.test.cpp
rename to test/variant_multiply_test.cpp
index 6d253ecbe..159fbb8cb 100644
--- a/test/variant_multiply.test.cpp
+++ b/test/variant_multiply_test.cpp
@@ -35,7 +35,7 @@
 #define EPSILON 0.0001
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(54);
 
   Variant v0(true);
diff --git a/test/variant_nomatch.test.cpp b/test/variant_nomatch_test.cpp
similarity index 99%
rename from test/variant_nomatch.test.cpp
rename to test/variant_nomatch_test.cpp
index 827facb25..31820f8ac 100644
--- a/test/variant_nomatch.test.cpp
+++ b/test/variant_nomatch_test.cpp
@@ -33,12 +33,12 @@
 
 #include <iostream>
 
-Task task;
-
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(120);
 
+  Task task;
+
   Variant vs0("untrue");   // !~ true
   Variant vs1(8421);       // !~ 42
   Variant vs2(3.14159);    // !~ 3.14
diff --git a/test/variant_not.test.cpp b/test/variant_not_test.cpp
similarity index 98%
rename from test/variant_not.test.cpp
rename to test/variant_not_test.cpp
index cafc4aa5c..15b6ad476 100644
--- a/test/variant_not.test.cpp
+++ b/test/variant_not_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(14);
 
   Variant v0(true);
diff --git a/test/variant_or.test.cpp b/test/variant_or_test.cpp
similarity index 99%
rename from test/variant_or.test.cpp
rename to test/variant_or_test.cpp
index 056e47a8e..9c91e2151 100644
--- a/test/variant_or.test.cpp
+++ b/test/variant_or_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(76);
 
   Variant v0(true);
diff --git a/test/variant_partial.test.cpp b/test/variant_partial_test.cpp
similarity index 99%
rename from test/variant_partial.test.cpp
rename to test/variant_partial_test.cpp
index 78893c4a6..40eef0c48 100644
--- a/test/variant_partial.test.cpp
+++ b/test/variant_partial_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(72);
 
   Variant v0(true);
diff --git a/test/variant_subtract.test.cpp b/test/variant_subtract_test.cpp
similarity index 99%
rename from test/variant_subtract.test.cpp
rename to test/variant_subtract_test.cpp
index d0e405047..967589123 100644
--- a/test/variant_subtract.test.cpp
+++ b/test/variant_subtract_test.cpp
@@ -35,7 +35,7 @@
 #define EPSILON 0.001
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(55);
 
   Variant v0(true);
diff --git a/test/variant_xor.test.cpp b/test/variant_xor_test.cpp
similarity index 99%
rename from test/variant_xor.test.cpp
rename to test/variant_xor_test.cpp
index 3e15fd212..0917d35a3 100644
--- a/test/variant_xor.test.cpp
+++ b/test/variant_xor_test.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(76);
 
   Variant v0(true);
diff --git a/test/view.test.cpp b/test/view_test.cpp
similarity index 99%
rename from test/view.test.cpp
rename to test/view_test.cpp
index 0d8b05acc..76a27541a 100644
--- a/test/view.test.cpp
+++ b/test/view_test.cpp
@@ -43,7 +43,7 @@ Context context;
 extern std::string configurationDefaults;
 
 ////////////////////////////////////////////////////////////////////////////////
-int main(int, char**) {
+int TEST_NAME(int, char**) {
   UnitTest t(1);
   Context context;
   Context::setContext(&context);