diff --git a/src/Makefile.test.include b/src/Makefile.test.include
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -52,13 +52,13 @@
 
 BITCOIN_TEST_SUITE = \
   test/jsonutil.cpp \
+  test/util/args.cpp \
   test/util/blockfilter.cpp \
   test/util/blockfilter.h \
   test/util/logging.cpp \
   test/util/logging.h \
   test/util/transaction_utils.cpp \
   test/util/transaction_utils.h \
-  test/main.cpp \
   test/scriptflags.cpp \
   test/sigutil.cpp \
   test/util/setup_common.h \
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -75,11 +75,11 @@
 
 add_boost_unit_tests_to_suite(bitcoin test_bitcoin
 	jsonutil.cpp
+	util/args.cpp
 	util/blockfilter.cpp
 	util/logging.cpp
 	util/setup_common.cpp
 	util/transaction_utils.cpp
-	main.cpp
 	scriptflags.cpp
 	sigutil.cpp
 
diff --git a/src/test/main.cpp b/src/test/util/args.cpp
rename from src/test/main.cpp
rename to src/test/util/args.cpp
--- a/src/test/main.cpp
+++ b/src/test/util/args.cpp
@@ -10,7 +10,7 @@
 
 namespace utf = boost::unit_test::framework;
 
-/*
+/**
  * Global fixture for passing custom arguments, and clearing them all after each
  * test case.
  */
@@ -43,4 +43,4 @@
     ~CustomArgumentsFixture(){};
 };
 
-BOOST_GLOBAL_FIXTURE(CustomArgumentsFixture);
+BOOST_TEST_GLOBAL_FIXTURE(CustomArgumentsFixture);