diff --git a/CppUnit/src/TestSuite.cpp b/CppUnit/src/TestSuite.cpp
index dbd0aaca4..3284f06ee 100644
--- a/CppUnit/src/TestSuite.cpp
+++ b/CppUnit/src/TestSuite.cpp
@@ -27,8 +27,8 @@ void TestSuite::run(TestResult *result)
 			break;
 
 		Test *test = *it;
-		if (_setup.size() > 0)
-			test->addSetup(_setup);
+		if (!setup().empty())
+			test->addSetup(setup());
 		test->run(result);
 	}
 }