diff --git a/tests/cppunit/cpptest-suite.h b/tests/cppunit/cpptest-suite.h
index 6e9aefc0a..b42a19fa1 100644
--- a/tests/cppunit/cpptest-suite.h
+++ b/tests/cppunit/cpptest-suite.h
@@ -55,7 +55,7 @@ namespace Test
 		Suite();
 		virtual ~Suite();
 		
-		void add(std::auto_ptr<Suite> suite);
+		void add(Suite* suite);
 		
 		bool run(Output& output, bool cont_after_fail = true);
 		
diff --git a/tests/cppunit/suite.cpp b/tests/cppunit/suite.cpp
index 954b4a2c4..f531e6c8f 100644
--- a/tests/cppunit/suite.cpp
+++ b/tests/cppunit/suite.cpp
@@ -117,9 +117,9 @@ namespace Test
 	/// \param suite %Test suite to add.
 	///
 	void
-	Suite::add(auto_ptr<Suite> suite)
+	Suite::add(Suite* suite)
 	{
-		_suites.push_back(suite.release());
+		_suites.push_back(suite);
 	}
 	
 	/// Registers a test function.
diff --git a/tests/main.cpp b/tests/main.cpp
index ff7dc8095..b52dba6d8 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -46,10 +46,10 @@ int main() {
         std::ofstream outfile("test_output.txt");
         std::unique_ptr<Test::Output> output(new Test::TextOutput(Test::TextOutput::Verbose, outfile));
         Test::Suite tests;
-        tests.add(std::auto_ptr<MemoryMappedFileTest>(new MemoryMappedFileTest()));
-        tests.add(std::auto_ptr<IPCMutexTest>(new IPCMutexTest()));
-        tests.add(std::auto_ptr<FixedMemoryHashTest>(new FixedMemoryHashTest()));
-        tests.add(std::auto_ptr<FixedMemoryVariableHashTest>(new FixedMemoryVariableHashTest()));
+        tests.add(new MemoryMappedFileTest());
+        tests.add(new IPCMutexTest());
+        tests.add(new FixedMemoryHashTest());
+        tests.add(new FixedMemoryVariableHashTest());
         tests.run(*output, true);
     } catch(...) {
         return -1;