diff --git a/tests/main.cpp b/tests/main.cpp
index 0c7c351f43..93bcdad4eb 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,2 +1,14 @@
-#define CATCH_CONFIG_MAIN
+#define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
+#include "Logger/Logger.h"
+
+int main( int argc, char* argv[] )
+{
+  // global setup...
+  arangodb::Logger::initialize(false);
+  int result = Catch::Session().run( argc, argv );
+  arangodb::Logger::shutdown();
+  // global clean-up...
+
+  return ( result < 0xff ? result : 0xff );
+}
\ No newline at end of file