2 files changed, 6 insertions, 16 deletions
diff --git a/lib/test/Makefile.am b/lib/test/Makefile.am
index 8de09f20..4d87f1b4 100644
--- a/lib/test/Makefile.am
+++ b/lib/test/Makefile.am
@@ -22,5 +22,5 @@ endif
 
 lib_test_libtest_la_SOURCES =	\
 	lib/test/testmain.cc
-lib_test_libtest_la_LIBADD = $(top_builddir)/lib/sbuild/libsbuild.la $(CPPUNIT_LIBS)
+lib_test_libtest_la_LIBADD = $(top_builddir)/lib/sbuild/libsbuild.la $(GTEST_LIBS)
 
diff --git a/lib/test/testmain.cc b/lib/test/testmain.cc
index 97dd7b1f..efeb69f3 100644
--- a/lib/test/testmain.cc
+++ b/lib/test/testmain.cc
@@ -20,15 +20,11 @@
 
 #include <sbuild/log.h>
 
-#include <cstdlib>
-
-#include <cppunit/ui/text/TestRunner.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-
-using namespace CppUnit;
+#include <gtest/gtest.h>
 
 int
-main()
+main(int   argc,
+     char *argv[])
 {
 #ifdef SBUILD_DEBUG
   sbuild::debug_log_level = sbuild::DEBUG_NOTICE;
@@ -36,12 +32,6 @@ main()
   sbuild::debug_log_level = sbuild::DEBUG_NONE;
 #endif
 
-  TextUi::TestRunner runner;
-
-  TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry::getRegistry();
-  runner.addTest(registry.makeTest());
-
-  bool ok = runner.run();
-
-  return (ok) ? EXIT_SUCCESS : EXIT_FAILURE;
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
 }