diff --git a/Code/Mantid/Framework/Build/Tests/Mantid.properties b/Code/Mantid/Framework/Build/Tests/Mantid.properties
index 3c0dcc72f794200c07cdfc6c3de55fd3a0c599a8..f2623727e3d8b6e8e2650b14bbd1b45493e2e8da 100644
--- a/Code/Mantid/Framework/Build/Tests/Mantid.properties
+++ b/Code/Mantid/Framework/Build/Tests/Mantid.properties
@@ -28,7 +28,7 @@ parameterDefinition.directory = ../../../Instrument
 pythonscripts.directory = ../../../scripts
 
 # Data search path
-datasearch.directories = ../../../../../Test/AutoTestData;../../../../../Test/Data;../../../../../Test/Data/sns_event_prenexus;../../../../../Test/Nexus;../../../../../Test/Nexus/SNS
+datasearch.directories = ../../../../../Test/AutoTestData;../../../Instrument
 
 # Default save directory
 defaultsave.directory = .
diff --git a/Code/Mantid/Framework/Build/Tests/UseManagedWS.properties b/Code/Mantid/Framework/Build/Tests/UseManagedWS.properties
index 475cf22b0fa5e2a53a36b78aec62597c7c8617be..b25f325d0baf7c7078e7e238ab9fc497adba0652 100644
--- a/Code/Mantid/Framework/Build/Tests/UseManagedWS.properties
+++ b/Code/Mantid/Framework/Build/Tests/UseManagedWS.properties
@@ -9,8 +9,11 @@ logging.channels.fileChannel.formatter.pattern = %Y-%m-%d %H:%M:%S,%i [%I] %p %s
 #Plugin configuration
 plugins.directory = ../../Build/Plugins
 
+# Data search path
+datasearch.directories = ../../../../../Test/AutoTestData;../../../Instrument
+
 #Where to load instrument definition files from
-instrumentDefinition.directory = ../../../../Test/Instrument
+instrumentDefinition.directory = ../../../Instrument
 
 # Uncommenting the line below will lead to all 2D workspaces being of the ManagedWorkspace2D variety
 ManagedWorkspace.LowerMemoryLimit = 0