diff --git a/src/tests/kits/support/barchivable/BArchivableTester.cpp b/src/tests/kits/support/barchivable/BArchivableTester.cpp
index ea0ee048fd..e16601cc0f 100644
--- a/src/tests/kits/support/barchivable/BArchivableTester.cpp
+++ b/src/tests/kits/support/barchivable/BArchivableTester.cpp
@@ -105,11 +105,11 @@ Test* TBArchivableTestCase::Suite()
 {
 	TestSuite* SuiteOfTests = new TestSuite;
 	ADD_TEST(SuiteOfTests, TBArchivableTestCase, TestPerform);
-#if !defined(SYSTEM_TEST)
+#if !defined(TEST_R5)
 	ADD_TEST(SuiteOfTests, TBArchivableTestCase, InvalidArchiveShallow);
 #endif
 	ADD_TEST(SuiteOfTests, TBArchivableTestCase, ValidArchiveShallow);
-#if !defined(SYSTEM_TEST)
+#if !defined(TEST_R5)
 	ADD_TEST(SuiteOfTests, TBArchivableTestCase, InvalidArchiveDeep);
 #endif
 	ADD_TEST(SuiteOfTests, TBArchivableTestCase, ValidArchiveDeep);
diff --git a/src/tests/kits/support/barchivable/LocalCommon.h b/src/tests/kits/support/barchivable/LocalCommon.h
index acb175cdee..ddefea7970 100644
--- a/src/tests/kits/support/barchivable/LocalCommon.h
+++ b/src/tests/kits/support/barchivable/LocalCommon.h
@@ -9,10 +9,10 @@
 // Standard Includes -----------------------------------------------------------
 
 // System Includes -------------------------------------------------------------
-#ifdef SYSTEM_TEST
+#ifdef TEST_R5
 #include <be/support/Archivable.h>
 #else
-#include "../../../../source/lib/support/headers/Archivable.h"
+#include "Archivable.h"
 #endif
 
 // Project Includes ------------------------------------------------------------
diff --git a/src/tests/kits/support/barchivable/ValidateInstantiationTester.cpp b/src/tests/kits/support/barchivable/ValidateInstantiationTester.cpp
index d788086a2c..b066858efd 100644
--- a/src/tests/kits/support/barchivable/ValidateInstantiationTester.cpp
+++ b/src/tests/kits/support/barchivable/ValidateInstantiationTester.cpp
@@ -134,11 +134,11 @@ void TValidateInstantiationTest::AllValid()
 Test* TValidateInstantiationTest::Suite()
 {
 	TestSuite* SuiteOfTests = new TestSuite;
-#if !defined(SYSTEM_TEST)
+#if !defined(TEST_R5)
 	ADD_TEST(SuiteOfTests, TValidateInstantiationTest, AllParamsInvalid);
 #endif
 	ADD_TEST(SuiteOfTests, TValidateInstantiationTest, ClassNameParamInvalid);
-#if !defined(SYSTEM_TEST)
+#if !defined(TEST_R5)
 	ADD_TEST(SuiteOfTests, TValidateInstantiationTest, ArchiveParamInvalid);
 #endif
 	ADD_TEST(SuiteOfTests, TValidateInstantiationTest, ClassFieldEmpty);
diff --git a/src/tests/kits/support/barchivable/remoteobjectdef/RemoteTestObject.h b/src/tests/kits/support/barchivable/remoteobjectdef/RemoteTestObject.h
index a6777cf70f..a542f80155 100644
--- a/src/tests/kits/support/barchivable/remoteobjectdef/RemoteTestObject.h
+++ b/src/tests/kits/support/barchivable/remoteobjectdef/RemoteTestObject.h
@@ -9,10 +9,10 @@
 // Standard Includes -----------------------------------------------------------
 
 // System Includes -------------------------------------------------------------
-#ifdef SYSTEM_TEST
+#ifdef TEST_R5
 #include <be/support/Archivable.h>
 #else
-#include "../../../../../source/lib/support/headers/Archivable.h"
+#include "Archivable.h"
 #endif
 
 // Project Includes ------------------------------------------------------------
diff --git a/src/tests/kits/support/blocker/BenaphoreLockCountTest1.cpp b/src/tests/kits/support/blocker/BenaphoreLockCountTest1.cpp
index 037d3e412e..f12c841904 100644
--- a/src/tests/kits/support/blocker/BenaphoreLockCountTest1.cpp
+++ b/src/tests/kits/support/blocker/BenaphoreLockCountTest1.cpp
@@ -1,5 +1,5 @@
 /*
-	$Id: BenaphoreLockCountTest1.cpp,v 1.1 2002/07/09 12:24:58 ejakowatz Exp $
+	$Id: BenaphoreLockCountTest1.cpp,v 1.2 2002/07/13 22:45:21 bonefish Exp $
 	
 	This file implements a test class for testing BLocker functionality.
 	It tests use cases "Count Lock Requests" for a benaphore style BLocker.
@@ -23,7 +23,7 @@
 
 
 #include "BenaphoreLockCountTest1.h"
-#include "TestSuite.h"
+#include "cppunit/TestSuite.h"
 #include "ThreadedTestCaller.h"
 #include <be/support/Locker.h>
 #include "Locker.h"