diff --git a/test/test.cpp b/test/test.cpp
index 4e7779e750d56687..1bb6ebcb9e8acf18 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -13,7 +13,6 @@ Test::Test()
 
 Test::~Test()
 {
-	cleanup();
 }
 
 int Test::execute()
@@ -24,5 +23,9 @@ int Test::execute()
 	if (ret < 0)
 		return ret;
 
-	return run();
+	ret = run();
+
+	cleanup();
+
+	return ret;
 }