diff --git a/tests/betting/betting_tests.cpp b/tests/betting/betting_tests.cpp
index 09ed9c38..2732d874 100644
--- a/tests/betting/betting_tests.cpp
+++ b/tests/betting/betting_tests.cpp
@@ -2860,21 +2860,14 @@ BOOST_AUTO_TEST_CASE( wimbledon_2017_gentelmen_singles_final_test )
 
 BOOST_AUTO_TEST_SUITE_END()
 
+struct GlobalInitializationFixture {
+    GlobalInitializationFixture() {
+        std::srand(time(NULL));
+        std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
 
-
-//#define BOOST_TEST_MODULE "C++ Unit Tests for Graphene Blockchain Database"
-#include <cstdlib>
-#include <iostream>
-#include <boost/test/included/unit_test.hpp>
-
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-    std::srand(time(NULL));
-    std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
-
-    // betting operations don't take effect until HARDFORK 1000
-    GRAPHENE_TESTING_GENESIS_TIMESTAMP =
-            (HARDFORK_1000_TIME.sec_since_epoch() + 15) / GRAPHENE_DEFAULT_BLOCK_INTERVAL * GRAPHENE_DEFAULT_BLOCK_INTERVAL;
-
-    return nullptr;
-}
+        // betting operations don't take effect until HARDFORK 1000
+        GRAPHENE_TESTING_GENESIS_TIMESTAMP = HARDFORK_1000_TIME.sec_since_epoch() + 2;
+    }
+};
+BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
 
diff --git a/tests/intense/main.cpp b/tests/intense/main.cpp
index c337407f..b2b2a6cb 100644
--- a/tests/intense/main.cpp
+++ b/tests/intense/main.cpp
@@ -21,12 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <cstdlib>
-#include <iostream>
-#include <boost/test/included/unit_test.hpp>
 
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-   std::srand(time(NULL));
-   std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
-   return nullptr;
-}
+#define BOOST_TEST_MODULE Intense Tests
+
+#include <boost/test/unit_test.hpp>
+
+#include <cstdlib>
+
+struct GlobalInitializationFixture {
+    GlobalInitializationFixture() {
+        std::srand(time(NULL));
+        std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
+    }
+};
+BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
+
diff --git a/tests/peerplays_sidechain/peerplays_sidechain_tests.cpp b/tests/peerplays_sidechain/peerplays_sidechain_tests.cpp
index d14fa602..ca2de270 100644
--- a/tests/peerplays_sidechain/peerplays_sidechain_tests.cpp
+++ b/tests/peerplays_sidechain/peerplays_sidechain_tests.cpp
@@ -5,13 +5,11 @@
 BOOST_AUTO_TEST_CASE(peerplays_sidechain) {
 }
 
-#include <boost/test/included/unit_test.hpp>
-#include <cstdlib>
-#include <iostream>
+struct GlobalInitializationFixture {
+    GlobalInitializationFixture() {
+        std::srand(time(NULL));
+        std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
+    }
+};
+BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
 
-boost::unit_test::test_suite *init_unit_test_suite(int argc, char *argv[]) {
-   std::srand(time(NULL));
-   std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
-
-   return nullptr;
-}
diff --git a/tests/performance/performance_tests.cpp b/tests/performance/performance_tests.cpp
index 5f36a3fc..c3fc2d74 100644
--- a/tests/performance/performance_tests.cpp
+++ b/tests/performance/performance_tests.cpp
@@ -74,13 +74,11 @@ BOOST_AUTO_TEST_CASE( transfer_benchmark )
 
 //BOOST_AUTO_TEST_SUITE_END()
 
-//#define BOOST_TEST_MODULE "C++ Unit Tests for Graphene Blockchain Database"
-#include <cstdlib>
-#include <iostream>
-#include <boost/test/included/unit_test.hpp>
+struct GlobalInitializationFixture {
+    GlobalInitializationFixture() {
+        std::srand(time(NULL));
+        std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
+    }
+};
+BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
 
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-   std::srand(time(NULL));
-   std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
-   return nullptr;
-}
diff --git a/tests/random/random_tests.cpp b/tests/random/random_tests.cpp
index db30658d..10c19d75 100644
--- a/tests/random/random_tests.cpp
+++ b/tests/random/random_tests.cpp
@@ -134,24 +134,24 @@ BOOST_FIXTURE_TEST_CASE( basic, database_fixture )
 
 BOOST_AUTO_TEST_SUITE_END()
 
-//#define BOOST_TEST_MODULE "C++ Unit Tests for Graphene Blockchain Database"
-#include <cstdlib>
-#include <iostream>
-#include <boost/test/included/unit_test.hpp>
-
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-    for (int i=1; i<argc; i++)
-    {
-       const std::string arg = argv[i];
-       std::cout << "#" << i << " " <<  arg << std::endl;
-       if(arg == "-R")
-          test_standard_rand = true;
-       else if(arg == "-A")
-          all_tests = true;
+struct GlobalInitializationFixture {
+    GlobalInitializationFixture() {
+       auto argc = boost::unit_test::framework::master_test_suite().argc;
+       auto argv = boost::unit_test::framework::master_test_suite().argv;
+       for (int i=1; i<argc; i++)
+       {
+          const std::string arg = argv[i];
+          std::cout << "#" << i << " " <<  arg << std::endl;
+          if(arg == "-R")
+             test_standard_rand = true;
+          else if(arg == "-A")
+             all_tests = true;
+       }
+       std::srand(time(NULL));
+       std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
+       if (signal(SIGPIPE, sig_handler) == SIG_ERR)
+           std::cout << "Can't catch SIGPIPE signal!" << std::endl;
     }
-    std::srand(time(NULL));
-    std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
-    if (signal(SIGPIPE, sig_handler) == SIG_ERR)
-        std::cout << "Can't catch SIGPIPE signal!" << std::endl;
-    return nullptr;
-}
+};
+BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
+
diff --git a/tests/tests/main.cpp b/tests/tests/main.cpp
index 405e7c10..deb48143 100644
--- a/tests/tests/main.cpp
+++ b/tests/tests/main.cpp
@@ -21,20 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+#define BOOST_TEST_MODULE Tests
+
 #include <cstdlib>
 #include <iostream>
 #include <boost/test/included/unit_test.hpp>
 
 extern uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP;
 
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-   std::srand(time(NULL));
-   std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
-   const char* genesis_timestamp_str = getenv("GRAPHENE_TESTING_GENESIS_TIMESTAMP");
-   if( genesis_timestamp_str != nullptr )
-   {
-      GRAPHENE_TESTING_GENESIS_TIMESTAMP = std::stoul( genesis_timestamp_str );
-   }
-   std::cout << "GRAPHENE_TESTING_GENESIS_TIMESTAMP is " << GRAPHENE_TESTING_GENESIS_TIMESTAMP << std::endl;
-   return nullptr;
-}
+struct GlobalInitializationFixture {
+    GlobalInitializationFixture() {
+        std::srand(time(NULL));
+        std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
+    }
+};
+BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
+
diff --git a/tests/tournament/tournament_tests.cpp b/tests/tournament/tournament_tests.cpp
index ba0cffe2..6ebd047a 100644
--- a/tests/tournament/tournament_tests.cpp
+++ b/tests/tournament/tournament_tests.cpp
@@ -2259,13 +2259,11 @@ BOOST_FIXTURE_TEST_CASE( massive, database_fixture )
 
 BOOST_AUTO_TEST_SUITE_END()
 
-//#define BOOST_TEST_MODULE "C++ Unit Tests for Graphene Blockchain Database"
-#include <cstdlib>
-#include <iostream>
-#include <boost/test/included/unit_test.hpp>
+struct GlobalInitializationFixture {
+    GlobalInitializationFixture() {
+        std::srand(time(NULL));
+        std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
+    }
+};
+BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
 
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-    std::srand(time(NULL));
-    std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
-    return nullptr;
-}