diff --git a/FWCore/Framework/test/BuildFile.xml b/FWCore/Framework/test/BuildFile.xml
index 23edf1c9841b6..4cdcc5e907dea 100644
--- a/FWCore/Framework/test/BuildFile.xml
+++ b/FWCore/Framework/test/BuildFile.xml
@@ -1,4 +1,3 @@
-<flags USE_UNITTEST_DIR="1"/>
 <use name="boost"/>
 <library file="DummyData.cc,DummyRecord.cc,DepRecord.cc,Dummy2Record.cc,DepOn2Record.cc" name="FWCoreFrameworkTestDummyForEventSetup">
   <use name="FWCore/Framework"/>
diff --git a/FWCore/Integration/test/BuildFile.xml b/FWCore/Integration/test/BuildFile.xml
index 3d7dc427d8f8e..7692947ec74a7 100644
--- a/FWCore/Integration/test/BuildFile.xml
+++ b/FWCore/Integration/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <environment>
-  <flags USE_UNITTEST_DIR="1"/>
   <bin name="TestFWCoreIntegrationStandalone" file="testRunner.cpp,standalone_t.cppunit.cc">
     <use name="cppunit"/>
     <use name="FWCore/Framework"/>
diff --git a/FWCore/Services/test/BuildFile.xml b/FWCore/Services/test/BuildFile.xml
index 09ba9208a636f..bb58f44272f38 100644
--- a/FWCore/Services/test/BuildFile.xml
+++ b/FWCore/Services/test/BuildFile.xml
@@ -1,4 +1,3 @@
-<flags USE_UNITTEST_DIR="1"/>
 <library file="StuckAnalyzer.cc" name="StuckAnalyzer">
   <flags EDM_PLUGIN="1"/>
   <use name="FWCore/Framework"/>
diff --git a/IOPool/Common/test/BuildFile.xml b/IOPool/Common/test/BuildFile.xml
index 0e7d75a7b5848..ee99d10de3405 100644
--- a/IOPool/Common/test/BuildFile.xml
+++ b/IOPool/Common/test/BuildFile.xml
@@ -1,4 +1,3 @@
-<flags USE_UNITTEST_DIR="1"/>
 <test name="TestEdmFastMerge" command="TestEdmFastMerge.sh"/>
 <test name="TestEdmConfigDump" command="run_TestEdmConfigDump.sh"/>
 <test name="testIOPoolCommonLumiOverlap" command="test_overlap_lumi_fast_copy.sh"/>
diff --git a/IOPool/Input/test/BuildFile.xml b/IOPool/Input/test/BuildFile.xml
index 47cb35a9f6a21..04ff2c262a6ef 100644
--- a/IOPool/Input/test/BuildFile.xml
+++ b/IOPool/Input/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <environment>
-  <flags USE_UNITTEST_DIR="1"/>
   <test name="TestPoolInput" command="TestPoolInput.sh"/>
 
   <library file="IOExerciser.cc" name="IOExerciser">
diff --git a/IOPool/Output/test/BuildFile.xml b/IOPool/Output/test/BuildFile.xml
index cf0715331de0f..d4ed012ce48fb 100644
--- a/IOPool/Output/test/BuildFile.xml
+++ b/IOPool/Output/test/BuildFile.xml
@@ -1,2 +1 @@
-<flags USE_UNITTEST_DIR="1"/>
 <test name="TestPoolOutput" command="TestPoolOutput.sh"/>
diff --git a/IOPool/SecondaryInput/test/BuildFile.xml b/IOPool/SecondaryInput/test/BuildFile.xml
index 59cb086500e52..d53c7288b6044 100644
--- a/IOPool/SecondaryInput/test/BuildFile.xml
+++ b/IOPool/SecondaryInput/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <environment>
-  <flags USE_UNITTEST_DIR="1"/>
   <test name="TestSecondaryInput" command="TestSecondaryInput.sh"/>
 
   <library file="SecondaryProducer.cc" name="SecondaryProducer">
diff --git a/IOPool/Streamer/test/BuildFile.xml b/IOPool/Streamer/test/BuildFile.xml
index 533e00ebd837b..51fad489005fb 100644
--- a/IOPool/Streamer/test/BuildFile.xml
+++ b/IOPool/Streamer/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <environment>
-  <flags USE_UNITTEST_DIR="1"/>
   <use name="FWCore/Framework"/>
   <bin file="EventMessageTest.cpp">
     <use name="IOPool/Streamer"/>