diff --git a/Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h b/Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h
index dfddd41f32caf2b12656529195061c38b624d407..24c6f0058a9162df7da80033acec4b6f4499e2b8 100644
--- a/Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h
@@ -27,7 +27,7 @@ public:
   {
     LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/HRP38692.raw");
+    loader.setPropertyValue("Filename","HRP38692.raw");
     inputWS = "rawWS";
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.setProperty("SpectrumMin",320);
@@ -64,7 +64,7 @@ public:
     align.setPropertyValue("InputWorkspace", inputWS);
     const std::string outputWS = "aligned";
     align.setPropertyValue("OutputWorkspace", outputWS);
-    align.setPropertyValue("CalibrationFile", "../../../../Test/AutoTestData/hrpd_new_072_01.cal");
+    align.setPropertyValue("CalibrationFile", "hrpd_new_072_01.cal");
 
     TS_ASSERT_THROWS_NOTHING( align.execute() );
     TS_ASSERT( align.isExecuted() );
@@ -92,11 +92,11 @@ public:
     inputWS = "eventWS";
     LoadEventPreNeXus loader;
     loader.initialize();
-    std::string eventfile( "../../../../Test/AutoTestData/CNCS_7860_neutron_event.dat" );
-    std::string pulsefile( "../../../../Test/AutoTestData/CNCS_7860_pulseid.dat" );
+    std::string eventfile( "CNCS_7860_neutron_event.dat" );
+    std::string pulsefile( "CNCS_7860_pulseid.dat" );
     loader.setPropertyValue("EventFilename", eventfile);
     loader.setProperty("PulseidFilename", pulsefile);
-    loader.setPropertyValue("MappingFilename", "../../../../Test/AutoTestData/CNCS_TS_2008_08_18.dat");
+    loader.setPropertyValue("MappingFilename", "CNCS_TS_2008_08_18.dat");
     loader.setPropertyValue("OutputWorkspace", inputWS);
 //    loader.setPropertyValue("InstrumentFilename", "../../../../Test/Instrument/CNCS_Definition.xml");
     loader.execute();
@@ -123,7 +123,7 @@ public:
     align.setPropertyValue("InputWorkspace", inputWS);
     const std::string outputWS = inputWS;
     align.setPropertyValue("OutputWorkspace", outputWS);
-    align.setPropertyValue("CalibrationFile", "../../../../Test/AutoTestData/refl_fake.cal");
+    align.setPropertyValue("CalibrationFile", "refl_fake.cal");
 
     TS_ASSERT_THROWS_NOTHING( align.execute() );
     TS_ASSERT( align.isExecuted() );
@@ -157,7 +157,7 @@ public:
     align.setPropertyValue("InputWorkspace", inputWS);
     const std::string outputWS = "eventWS_changed";
     align.setPropertyValue("OutputWorkspace", outputWS);
-    align.setPropertyValue("CalibrationFile", "../../../../Test/AutoTestData/refl_fake.cal");
+    align.setPropertyValue("CalibrationFile", "refl_fake.cal");
 
     TS_ASSERT_THROWS_NOTHING( align.execute() );
     TS_ASSERT( align.isExecuted() );
diff --git a/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h b/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h
index 59905a257c8fd2f92c6135e74186580a99676c64..f75ce0fec4968789ba8b817d0e0ab10e06e606d5 100644
--- a/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h
@@ -19,7 +19,7 @@ public:
   {
     Mantid::DataHandling::LoadSpice2D loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/BioSANS_test_data.xml");
+    loader.setPropertyValue("Filename","BioSANS_test_data.xml");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.execute();
 
diff --git a/Code/Mantid/Framework/Algorithms/test/CalculateEfficiencyTest.h b/Code/Mantid/Framework/Algorithms/test/CalculateEfficiencyTest.h
index 6b18b8a526179fa1b66c6760c08fb5e219bc206d..49635985f2ded61a44007e70faab880a31e2905b 100644
--- a/Code/Mantid/Framework/Algorithms/test/CalculateEfficiencyTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CalculateEfficiencyTest.h
@@ -144,7 +144,7 @@ public:
   {
     Mantid::DataHandling::LoadSpice2D loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/BioSANS_exp61_scan0004_0001.xml");
+    loader.setPropertyValue("Filename","BioSANS_exp61_scan0004_0001.xml");
     const std::string inputWS("wav");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h b/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h
index adc645ea1381ce48641a5eca021623f3efe9d01a..c3ce67db8c3070c58e9a7ecdaa97bf1a6c7da771 100644
--- a/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h
@@ -20,7 +20,7 @@ public:
   {
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/LOQ48127.raw");
+    loader.setPropertyValue("Filename","LOQ48127.raw");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.setPropertyValue("SpectrumMin","2");
     loader.setPropertyValue("SpectrumMax","4");
diff --git a/Code/Mantid/Framework/Algorithms/test/ChangeBinOffsetTest.h b/Code/Mantid/Framework/Algorithms/test/ChangeBinOffsetTest.h
index 9c262754aae3be3fbbbbbe7d65a8e20991ac4fcc..92b9035c6dbac9e51f8bb25cf69542c94f1e6948 100644
--- a/Code/Mantid/Framework/Algorithms/test/ChangeBinOffsetTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ChangeBinOffsetTest.h
@@ -159,11 +159,11 @@ public:
     this->inputSpace = "eventWS";
     Mantid::DataHandling::LoadEventPreNeXus loader;
     loader.initialize();
-    std::string eventfile( "../../../../Test/AutoTestData/CNCS_7860_neutron_event.dat" );
-    std::string pulsefile( "../../../../Test/AutoTestData/CNCS_7860_pulseid.dat" );
+    std::string eventfile( "CNCS_7860_neutron_event.dat" );
+    std::string pulsefile( "CNCS_7860_pulseid.dat" );
     loader.setPropertyValue("EventFilename", eventfile);
     loader.setProperty("PulseidFilename", pulsefile);
-    loader.setPropertyValue("MappingFilename", "../../../../Test/AutoTestData/CNCS_TS_2008_08_18.dat");
+    loader.setPropertyValue("MappingFilename", "CNCS_TS_2008_08_18.dat");
     loader.setPropertyValue("OutputWorkspace", this->inputSpace);
     loader.execute();
     TS_ASSERT (loader.isExecuted() );
diff --git a/Code/Mantid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h b/Code/Mantid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h
index e6d25c1fac53f145e79bfe3dc328b16ba75a76f5..8a75c975cb5df009ea931f9eaf486e6d7dcaed2b 100644
--- a/Code/Mantid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h
@@ -23,7 +23,7 @@ public:
   {
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/LOQ48127.raw");
+    loader.setPropertyValue("Filename", "LOQ48127.raw");
     loader.setPropertyValue("OutputWorkspace", loq);
     loader.execute();
   }
diff --git a/Code/Mantid/Framework/Algorithms/test/CloneWorkspaceTest.h b/Code/Mantid/Framework/Algorithms/test/CloneWorkspaceTest.h
index a49a1a223c1cf988c553a31c1885d94d29ddece8..13c4eb5520bc036d28f87c04f476b44c27067e9a 100644
--- a/Code/Mantid/Framework/Algorithms/test/CloneWorkspaceTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CloneWorkspaceTest.h
@@ -44,7 +44,7 @@ public:
     
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/LOQ48127.raw");
+    loader.setPropertyValue("Filename", "LOQ48127.raw");
     loader.setPropertyValue("OutputWorkspace", "in");
     loader.execute();
     
diff --git a/Code/Mantid/Framework/Algorithms/test/ConjoinWorkspacesTest.h b/Code/Mantid/Framework/Algorithms/test/ConjoinWorkspacesTest.h
index c9c01d8d7c74e5df7fc95d9b2a99d4168dc3eff2..6118775e12bd8ae35e707377a6ac4e5831f65684 100644
--- a/Code/Mantid/Framework/Algorithms/test/ConjoinWorkspacesTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ConjoinWorkspacesTest.h
@@ -23,7 +23,7 @@ public:
     IAlgorithm* loader;
     loader = new Mantid::DataHandling::LoadRaw;
     loader->initialize();
-    loader->setPropertyValue("Filename", "../../../../Test/AutoTestData/OSI11886.raw");
+    loader->setPropertyValue("Filename", "OSI11886.raw");
     loader->setPropertyValue("OutputWorkspace", "top");
     loader->setPropertyValue("SpectrumMin","1");
     loader->setPropertyValue("SpectrumMax","10");
@@ -33,7 +33,7 @@ public:
 
     loader = new Mantid::DataHandling::LoadRaw;
     loader->initialize();
-    loader->setPropertyValue("Filename", "../../../../Test/AutoTestData/OSI11886.raw");
+    loader->setPropertyValue("Filename", "OSI11886.raw");
     loader->setPropertyValue("OutputWorkspace", "bottom");
     loader->setPropertyValue("SpectrumMin","11");
     loader->setPropertyValue("SpectrumMax","25");
@@ -44,7 +44,7 @@ public:
     //Now some event workspaces
     loader = new Mantid::DataHandling::LoadEventPreNeXus;
     loader->initialize();
-    loader->setPropertyValue("EventFilename", "../../../../Test/AutoTestData/VULCAN_2916_neutron0_event.dat");
+    loader->setPropertyValue("EventFilename", "VULCAN_2916_neutron0_event.dat");
     loader->setPropertyValue("OutputWorkspace", "vulcan0");
     TS_ASSERT_THROWS_NOTHING( loader->execute() );
     TS_ASSERT( loader->isExecuted() );
@@ -52,7 +52,7 @@ public:
 
     loader = new Mantid::DataHandling::LoadEventPreNeXus;
     loader->initialize();
-    loader->setPropertyValue("EventFilename", "../../../../Test/AutoTestData/VULCAN_2916_neutron1_event.dat");
+    loader->setPropertyValue("EventFilename", "VULCAN_2916_neutron1_event.dat");
     loader->setPropertyValue("OutputWorkspace", "vulcan1");
     TS_ASSERT_THROWS_NOTHING( loader->execute() );
     TS_ASSERT( loader->isExecuted() );
diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertSpectrumAxisTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertSpectrumAxisTest.h
index 90386297fece06992f29c9958a3eb633c7e5ca0e..391675223f04c91f48171efc088814f2a30bd234 100644
--- a/Code/Mantid/Framework/Algorithms/test/ConvertSpectrumAxisTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ConvertSpectrumAxisTest.h
@@ -50,7 +50,7 @@ public:
 
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/LOQ48127.raw");
+    loader.setPropertyValue("Filename","LOQ48127.raw");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.setPropertyValue("SpectrumMin","2");
     loader.setPropertyValue("SpectrumMax","3");
diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertToMatrixWorkspaceTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertToMatrixWorkspaceTest.h
index 8d20359ac7f6e1ebfbfb49b17b9337f7a2aa5b30..f939b025608cded91a5819f9496e9ae282f16b5b 100644
--- a/Code/Mantid/Framework/Algorithms/test/ConvertToMatrixWorkspaceTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ConvertToMatrixWorkspaceTest.h
@@ -39,7 +39,7 @@ public:
 
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/LOQ48127.raw");
+    loader.setPropertyValue("Filename", "LOQ48127.raw");
     loader.setPropertyValue("OutputWorkspace", "in");
     loader.execute();
 
diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h
index f3d2393101139238bbbc4c9fab0a45f4d5c24439..9e78f54be51f0bb46b5d347ec8049753b26747c7 100644
--- a/Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h
@@ -193,7 +193,7 @@ public:
   {
     Mantid::DataHandling::LoadRaw loader;
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/MAR11060.raw");
+    loader.setPropertyValue("Filename", "MAR11060.raw");
     loader.setPropertyValue("SpectrumList", "900");
     std::string ws = "mar";
     loader.setPropertyValue("OutputWorkspace", ws);
@@ -239,11 +239,11 @@ public:
     this->inputSpace = "eventWS";
     Mantid::DataHandling::LoadEventPreNeXus loader;
     loader.initialize();
-    std::string eventfile( "../../../../Test/AutoTestData/CNCS_7860_neutron_event.dat" );
-    std::string pulsefile( "../../../../Test/AutoTestData/CNCS_7860_pulseid.dat" );
+    std::string eventfile( "CNCS_7860_neutron_event.dat" );
+    std::string pulsefile( "CNCS_7860_pulseid.dat" );
     loader.setPropertyValue("EventFilename", eventfile);
     loader.setProperty("PulseidFilename", pulsefile);
-    loader.setPropertyValue("MappingFilename", "../../../../Test/AutoTestData/CNCS_TS_2008_08_18.dat");
+    loader.setPropertyValue("MappingFilename", "CNCS_TS_2008_08_18.dat");
     loader.setPropertyValue("OutputWorkspace", this->inputSpace);
 //    loader.setPropertyValue("InstrumentFilename", "../../../../Test/Instrument/CNCS_Definition.xml");
     loader.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/CorrectKiKfTest.h b/Code/Mantid/Framework/Algorithms/test/CorrectKiKfTest.h
index 350ab787f0f43d67be8bae0393e9345a5cb1e1f5..be57e9bac8a246d28d1dfd20fd5f4113365c27e7 100644
--- a/Code/Mantid/Framework/Algorithms/test/CorrectKiKfTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CorrectKiKfTest.h
@@ -150,7 +150,7 @@ public:
   {
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/IRS38633.raw");
+    loader.setPropertyValue("Filename","IRS38633.raw");
     const std::string initialWS("IRS");
     const std::string intermediaryWS("IRSenergy");
     const std::string finalWS("Corrected");
diff --git a/Code/Mantid/Framework/Algorithms/test/CorrectToFileTest.h b/Code/Mantid/Framework/Algorithms/test/CorrectToFileTest.h
index a3003e5cc229d1ddf359967c5ae3306193a93611..3ed658acb9d80317e6bb5e50de79150baef2cd68 100644
--- a/Code/Mantid/Framework/Algorithms/test/CorrectToFileTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CorrectToFileTest.h
@@ -17,7 +17,7 @@ public:
 
   CorrectToFileTest() : inputFile("")
   {
-    inputFile = Poco::Path(Poco::Path::current()).resolve("../../../../Test/AutoTestData/DIRECT.041").toString();
+    inputFile = Poco::Path(Poco::Path::current()).resolve("DIRECT.041").toString();
   }
 
   void testInit()
diff --git a/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyCorTest.h b/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyCorTest.h
index b1cd3dbbce0d8a9aed0cfad93c3949eb62c0b044..6b7f8ab7c4945f28c5ecdd83d61b0c7307894122 100644
--- a/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyCorTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyCorTest.h
@@ -43,7 +43,7 @@ public:
       m_DatFile("DetectorEfficiencyCorTest_filename.dat")
   {
     // the Ei value depends on the RAW file, during normal testing only use the small RAW file
-    m_Ei = 12.9462875; m_rawFile = Poco::Path(Poco::Path::current()).resolve("../../../../Test/AutoTestData/MAR11001.raw").toString();
+    m_Ei = 12.9462875; m_rawFile = Poco::Path(Poco::Path::current()).resolve("MAR11001.raw").toString();
   }
 
   void setUp()
diff --git a/Code/Mantid/Framework/Algorithms/test/DiffractionFocussing2Test.h b/Code/Mantid/Framework/Algorithms/test/DiffractionFocussing2Test.h
index 8622ce5dee6643446412ca89ddf55e3f3318f438..1b24abec368df5313fae187452d0e026ac7f39f2 100644
--- a/Code/Mantid/Framework/Algorithms/test/DiffractionFocussing2Test.h
+++ b/Code/Mantid/Framework/Algorithms/test/DiffractionFocussing2Test.h
@@ -47,7 +47,7 @@ public:
 	{
     Mantid::DataHandling::LoadRaw loader;
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/HRP38692.raw");
+    loader.setPropertyValue("Filename", "HRP38692.raw");
 
     std::string outputSpace = "tofocus";
     loader.setPropertyValue("OutputWorkspace", outputSpace);
@@ -61,13 +61,13 @@ public:
     align.initialize();
     align.setPropertyValue("InputWorkspace",outputSpace);
     align.setPropertyValue("OutputWorkspace",outputSpace);
-    align.setPropertyValue("CalibrationFile","../../../../Test/AutoTestData/hrpd_new_072_01.cal");
+    align.setPropertyValue("CalibrationFile","hrpd_new_072_01.cal");
     TS_ASSERT_THROWS_NOTHING( align.execute() );
     TS_ASSERT( align.isExecuted() );
 
     focus.setPropertyValue("InputWorkspace", outputSpace);
     focus.setPropertyValue("OutputWorkspace", "focusedWS" );
-    focus.setPropertyValue("GroupingFileName","../../../../Test/AutoTestData/hrpd_new_072_01.cal");
+    focus.setPropertyValue("GroupingFileName","hrpd_new_072_01.cal");
 
 	  TS_ASSERT_THROWS_NOTHING( focus.execute() );
 	  TS_ASSERT( focus.isExecuted() );
@@ -88,9 +88,9 @@ public:
     LoadEventPreNeXus * eventLoader;
     eventLoader = new LoadEventPreNeXus();
     eventLoader->initialize();
-    eventLoader->setPropertyValue("EventFilename", "../../../../Test/AutoTestData/REF_L_32035_neutron_event.dat");
-    eventLoader->setProperty("PulseidFilename",  "../../../../Test/AutoTestData/REF_L_32035_pulseid.dat");
-    eventLoader->setPropertyValue("MappingFilename", "../../../../Test/AutoTestData/REF_L_TS_2010_02_19.dat");
+    eventLoader->setPropertyValue("EventFilename", "REF_L_32035_neutron_event.dat");
+    eventLoader->setProperty("PulseidFilename",  "REF_L_32035_pulseid.dat");
+    eventLoader->setPropertyValue("MappingFilename", "REF_L_TS_2010_02_19.dat");
     eventLoader->setPropertyValue("OutputWorkspace", "refl");
     TS_ASSERT( eventLoader->execute() );
 
@@ -122,7 +122,7 @@ public:
     focus.setPropertyValue("OutputWorkspace", outputws);
 
     //This fake calibration file was generated using DiffractionFocussing2Test_helper.py
-    focus.setPropertyValue("GroupingFileName","../../../../Test/AutoTestData/refl_fake.cal");
+    focus.setPropertyValue("GroupingFileName","refl_fake.cal");
 
     //OK, run the algorithm
     focus.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/DiffractionFocussing2_helper.py b/Code/Mantid/Framework/Algorithms/test/DiffractionFocussing2_helper.py
index cf80aad65a7c868414b3a5af05f825ca03d97b39..705107dbfcdb6ca58c463cf05441ab6b9268796e 100644
--- a/Code/Mantid/Framework/Algorithms/test/DiffractionFocussing2_helper.py
+++ b/Code/Mantid/Framework/Algorithms/test/DiffractionFocussing2_helper.py
@@ -1,6 +1,6 @@
 """This script outputs a fake refl calibration file."""
 numpix = 304*256+100
-outfile = "../../../../Test/AutoTestData/refl_fake.cal"
+outfile = "../../../../../Test/AutoTestData/refl_fake.cal"
 f = open(outfile, 'w')
 f.write("# refl FAKE detector file, written for a test\n")
 f.write("# Format: number  UDET offset  select  group\n")
diff --git a/Code/Mantid/Framework/Algorithms/test/DiffractionFocussingTest.h b/Code/Mantid/Framework/Algorithms/test/DiffractionFocussingTest.h
index 1911e88786b5213ec229d13473498544978f04f8..1d01843b82aabff55c36dbd0a2c65b32bb992183 100644
--- a/Code/Mantid/Framework/Algorithms/test/DiffractionFocussingTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/DiffractionFocussingTest.h
@@ -39,7 +39,7 @@ public:
 	{
     IAlgorithm* loader = new Mantid::DataHandling::LoadRaw;
     loader->initialize();
-    loader->setPropertyValue("Filename", "../../../../Test/AutoTestData/HRP38692.raw");
+    loader->setPropertyValue("Filename", "HRP38692.raw");
 
     std::string outputSpace = "tofocus";
     loader->setPropertyValue("OutputWorkspace", outputSpace);
@@ -50,7 +50,7 @@ public:
 
     focus.setPropertyValue("InputWorkspace", outputSpace);
     focus.setPropertyValue("OutputWorkspace", "focusedWS" );
-    focus.setPropertyValue("GroupingFileName","../../../../Test/AutoTestData/hrpd_new_072_01.cal");
+    focus.setPropertyValue("GroupingFileName","hrpd_new_072_01.cal");
 
 	  TS_ASSERT_THROWS_NOTHING( focus.execute() );
 	  TS_ASSERT( focus.isExecuted() );
diff --git a/Code/Mantid/Framework/Algorithms/test/ExtractFFTSpectrumTest.h b/Code/Mantid/Framework/Algorithms/test/ExtractFFTSpectrumTest.h
index 3927ab43c6207974bc230ccb21dd288b8431edc9..9f7e4e45fccb40ccb2d4b480b66a477cdea0509b 100644
--- a/Code/Mantid/Framework/Algorithms/test/ExtractFFTSpectrumTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ExtractFFTSpectrumTest.h
@@ -43,7 +43,7 @@ public:
     IAlgorithm* loader;
     loader = new LoadNexus;
     loader->initialize();
-    loader->setPropertyValue("Filename", "../../../../Test/AutoTestData/IRS26176_ipg.nxs");
+    loader->setPropertyValue("Filename", "IRS26176_ipg.nxs");
     loader->setPropertyValue("OutputWorkspace", "alg_irs_r");
     loader->setPropertyValue("SpectrumMin", "2");
     loader->setPropertyValue("SpectrumMax", "3");
diff --git a/Code/Mantid/Framework/Algorithms/test/FFTSmooth2Test.h b/Code/Mantid/Framework/Algorithms/test/FFTSmooth2Test.h
index 871f2a28550b2c731c57afc3c6deff093a73d6c1..bab6dbbcb3712585a81de538a4475c3e5f043bec 100644
--- a/Code/Mantid/Framework/Algorithms/test/FFTSmooth2Test.h
+++ b/Code/Mantid/Framework/Algorithms/test/FFTSmooth2Test.h
@@ -67,12 +67,12 @@ public:
   {                                               // load input and "Gold" result workspaces
     Mantid::NeXus::LoadNexusProcessed loader;
     loader.initialize();
-    loader.setProperty("Filename","../../../../Test/AutoTestData/MultispectralTestData.nxs");
+    loader.setProperty("Filename","MultispectralTestData.nxs");
     loader.setProperty("OutputWorkspace","TestInputWS");
     loader.execute();
 
     loader.initialize();
-    loader.setProperty("Filename","../../../../Test/AutoTestData/FFTSmooth2_Zeroing.nxs");
+    loader.setProperty("Filename","FFTSmooth2_Zeroing.nxs");
     loader.setProperty("OutputWorkspace","ZeroingGoldWS");
     loader.execute();
                                                  // create and execute the algorithm for "Zeroing"
@@ -115,12 +115,12 @@ public:
   {                                               // load input and "Gold" result workspaces
     Mantid::NeXus::LoadNexusProcessed loader;
     loader.initialize();
-    loader.setProperty("Filename","../../../../Test/AutoTestData/MultispectralTestData.nxs");
+    loader.setProperty("Filename","MultispectralTestData.nxs");
     loader.setProperty("OutputWorkspace","TestInputWS");
     loader.execute();
 
     loader.initialize();
-    loader.setProperty("Filename","../../../../Test/AutoTestData/FFTSmooth2_Butterworth.nxs");
+    loader.setProperty("Filename","FFTSmooth2_Butterworth.nxs");
     loader.setProperty("OutputWorkspace","ButterworthGoldWS");
     loader.execute();
                                                  // create and execute the algorithm for "Butterworth"
diff --git a/Code/Mantid/Framework/Algorithms/test/FilterByLogValueTest.h b/Code/Mantid/Framework/Algorithms/test/FilterByLogValueTest.h
index 63dd5c3e198588eb0545a66aa9c522eac971b544..0ed40f89d88548c0a604698165b838cddd098fea 100644
--- a/Code/Mantid/Framework/Algorithms/test/FilterByLogValueTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/FilterByLogValueTest.h
@@ -38,7 +38,7 @@ public:
   {
     IAlgorithm_sptr loader = AlgorithmManager::Instance().create("LoadSNSEventNexus");
     loader->initialize();
-    loader->setPropertyValue("Filename", "../../../../Test/AutoTestData/CNCS_7860_event.nxs");
+    loader->setPropertyValue("Filename", "CNCS_7860_event.nxs");
     loader->setPropertyValue("OutputWorkspace", inputWS);
     loader->execute();
     TS_ASSERT (loader->isExecuted() );
diff --git a/Code/Mantid/Framework/Algorithms/test/FilterByTimeTest.h b/Code/Mantid/Framework/Algorithms/test/FilterByTimeTest.h
index 0301e4f930145d61826b6c0c6d064ad99ab6aa0e..c4fca6f4517dd1a2e9e5a1b0c40e02275034521a 100644
--- a/Code/Mantid/Framework/Algorithms/test/FilterByTimeTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/FilterByTimeTest.h
@@ -35,11 +35,11 @@ public:
     inputWS = "eventWS";
     LoadEventPreNeXus loader;
     loader.initialize();
-    std::string eventfile( "../../../../Test/AutoTestData/CNCS_7860_neutron_event.dat" );
-    std::string pulsefile( "../../../../Test/AutoTestData/CNCS_7860_pulseid.dat" );
+    std::string eventfile( "CNCS_7860_neutron_event.dat" );
+    std::string pulsefile( "CNCS_7860_pulseid.dat" );
     loader.setPropertyValue("EventFilename", eventfile);
     loader.setProperty("PulseidFilename", pulsefile);
-    loader.setPropertyValue("MappingFilename", "../../../../Test/AutoTestData/CNCS_TS_2008_08_18.dat");
+    loader.setPropertyValue("MappingFilename", "CNCS_TS_2008_08_18.dat");
     loader.setPropertyValue("OutputWorkspace", inputWS);
     loader.execute();
     TS_ASSERT (loader.isExecuted() );
diff --git a/Code/Mantid/Framework/Algorithms/test/FindCenterOfMassPositionTest.h b/Code/Mantid/Framework/Algorithms/test/FindCenterOfMassPositionTest.h
index 2006d0761b4bd2ec3b9daf34665e198f5334a015..ead279df7b877a55fda1da095042a6b6a61b870e 100644
--- a/Code/Mantid/Framework/Algorithms/test/FindCenterOfMassPositionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/FindCenterOfMassPositionTest.h
@@ -158,7 +158,7 @@ public:
     Mantid::Algorithms::FindCenterOfMassPosition center;
     Mantid::DataHandling::LoadSpice2D loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/BioSANS_empty_cell.xml");
+    loader.setPropertyValue("Filename","BioSANS_empty_cell.xml");
     const std::string inputWS("wav");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/FindPeaksTest.h b/Code/Mantid/Framework/Algorithms/test/FindPeaksTest.h
index 00feb5a55995ee32d34c4bc40e727f5a62475cac..84b5f8b8ad9b33cc1c5760960d4195b089bcfb4f 100644
--- a/Code/Mantid/Framework/Algorithms/test/FindPeaksTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/FindPeaksTest.h
@@ -19,7 +19,7 @@ public:
   {
     Mantid::NeXus::LoadNexusProcessed loader;
     loader.initialize();
-    loader.setProperty("Filename","../../../../Test/AutoTestData/focussed.nxs");
+    loader.setProperty("Filename","focussed.nxs");
     loader.setProperty("OutputWorkspace","peaksWS");
     loader.execute();
   }
@@ -71,7 +71,7 @@ public:
   {
     Mantid::NeXus::LoadNexusProcessed loader;
     loader.initialize();
-    loader.setProperty("Filename","../../../../Test/AutoTestData/PG3_733_focussed.nxs");
+    loader.setProperty("Filename","PG3_733_focussed.nxs");
     loader.setProperty("OutputWorkspace","vanadium");
     loader.execute();
   }
diff --git a/Code/Mantid/Framework/Algorithms/test/GetEiTest.h b/Code/Mantid/Framework/Algorithms/test/GetEiTest.h
index 656e1c7df559720da3427060ab6aac2b1f571352..d09e95c36c8140e02acc95102236c00baf1f271c 100644
--- a/Code/Mantid/Framework/Algorithms/test/GetEiTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/GetEiTest.h
@@ -106,11 +106,11 @@ public:
 
   GetEiTest() : m_WS("GetEi_input_workspace")
   {
-    m_MARI1 = Poco::Path(Poco::Path::current()).resolve("../../../../Test/AutoTestData/MAR11001.raw").toString();
-    m_MARI2 = Poco::Path(Poco::Path::current()).resolve("../../../../Test/AutoTestData/MAR15306.raw").toString();
-    m_MARI3 = Poco::Path(Poco::Path::current()).resolve("../../../../Test/AutoTestData/MAR15317.raw").toString();
-    m_MAPS = Poco::Path(Poco::Path::current()).resolve("../../../../Test/AutoTestData/MAP10266.raw").toString();
-    m_MERLIN = Poco::Path(Poco::Path::current()).resolve("../../../../Test/AutoTestData/MER02257.raw").toString();
+    m_MARI1 = Poco::Path(Poco::Path::current()).resolve("MAR11001.raw").toString();
+    m_MARI2 = Poco::Path(Poco::Path::current()).resolve("MAR15306.raw").toString();
+    m_MARI3 = Poco::Path(Poco::Path::current()).resolve("MAR15317.raw").toString();
+    m_MAPS = Poco::Path(Poco::Path::current()).resolve("MAP10266.raw").toString();
+    m_MERLIN = Poco::Path(Poco::Path::current()).resolve("MER02257.raw").toString();
   }
 
   private:
diff --git a/Code/Mantid/Framework/Algorithms/test/GroupWorkspacesTest.h b/Code/Mantid/Framework/Algorithms/test/GroupWorkspacesTest.h
index 6f0d4aaec5f24b552517e1f133560adcf7724ede..6e40ae206d75398b824aa68ef722d91187607a66 100644
--- a/Code/Mantid/Framework/Algorithms/test/GroupWorkspacesTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/GroupWorkspacesTest.h
@@ -58,7 +58,7 @@ public:
 	{
 		LoadRaw3 alg;
 		alg.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48097.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","LOQ48097.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("OutputWorkspace","LOQ48097"));
 		TS_ASSERT_THROWS_NOTHING( alg.execute());
 		TS_ASSERT( alg.isExecuted() );
@@ -78,14 +78,14 @@ public:
 			
 		LoadRaw3 alg;
 		alg.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48097.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","LOQ48097.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("OutputWorkspace","LOQ48097"));
 		TS_ASSERT_THROWS_NOTHING( alg.execute());
 		TS_ASSERT( alg.isExecuted() );
 
 		LoadRaw3 alg1;
 		alg1.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48098.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("FileName","LOQ48098.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("OutputWorkspace","LOQ48098"));
 		TS_ASSERT_THROWS_NOTHING( alg1.execute());
 		TS_ASSERT( alg1.isExecuted() );
@@ -115,21 +115,21 @@ public:
 	{
 		LoadRaw3 alg;
 		alg.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48094.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","LOQ48094.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("OutputWorkspace","LOQ48094"));
 		TS_ASSERT_THROWS_NOTHING( alg.execute());
 		TS_ASSERT( alg.isExecuted() );
 
 		LoadRaw3 alg1;
 		alg1.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48098.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("FileName","LOQ48098.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("OutputWorkspace","LOQ48098"));
 		TS_ASSERT_THROWS_NOTHING( alg1.execute());
 		TS_ASSERT( alg1.isExecuted() );
 
 		LoadRaw3 alg2;
 		alg2.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg2.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48097.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg2.setPropertyValue("FileName","LOQ48097.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg2.setPropertyValue("OutputWorkspace","LOQ48097"));
 		TS_ASSERT_THROWS_NOTHING( alg2.execute());
 		TS_ASSERT( alg2.isExecuted() );
@@ -162,14 +162,14 @@ public:
 	{
 		LoadRaw3 alg;
 		alg.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","../../../../Test/AutoTestData/EVS13895.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","EVS13895.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("OutputWorkspace","EVS13895"));
 		TS_ASSERT_THROWS_NOTHING( alg.execute());
 		TS_ASSERT( alg.isExecuted() );
 
 		LoadRaw3 alg1;
 	    alg1.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48098.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("FileName","LOQ48098.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg1.setPropertyValue("OutputWorkspace","LOQ48098"));
 		TS_ASSERT_THROWS_NOTHING( alg1.execute());
 		TS_ASSERT( alg1.isExecuted() );
@@ -215,14 +215,14 @@ public:
 	{
 		 LoadRaw3 alg;
 		alg.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48094.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","LOQ48094.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("OutputWorkspace","LOQ48094"));
 		TS_ASSERT_THROWS_NOTHING( alg.execute());
 		TS_ASSERT( alg.isExecuted() );
 
 		Mantid::NeXus::LoadNexusProcessed loader;
 		loader.initialize();
-		loader.setProperty("Filename","../../../../Test/AutoTestData/focussed.nxs");
+		loader.setProperty("Filename","focussed.nxs");
 		loader.setProperty("OutputWorkspace","peaksWS");
 		TS_ASSERT_THROWS_NOTHING(loader.execute());
 
diff --git a/Code/Mantid/Framework/Algorithms/test/MemoryLeakTest.h b/Code/Mantid/Framework/Algorithms/test/MemoryLeakTest.h
index e6a866348fe483fa8025be693f5bfa5ae6cf539a..9831810113566aeec24f1e3ade1e7fd98bbdb20a 100644
--- a/Code/Mantid/Framework/Algorithms/test/MemoryLeakTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MemoryLeakTest.h
@@ -159,7 +159,7 @@ public:
 //      IAlgorithm_sptr ld = AlgorithmFactory::Instance().create("LoadLogsFromSNSNexus",1);
 //      std::string outws_name = "cncs";
 //      ld->initialize();
-//      ld->setPropertyValue("Filename","/home/8oz/data/PG3_1370_event.nxs");
+//      ld->setPropertyValue("Filename","PG3_1370_event.nxs");
 //      ld->setPropertyValue("Workspace","fake");
 //      ld->execute();
 //      TS_ASSERT( ld->isExecuted() );
@@ -184,7 +184,7 @@ public:
 
 //      CNCS_7850_event.nxs should be replaced by CNCS_7860_event.nxs and check if you need to change anything else
 
-//      ld.setPropertyValue("Filename","../../../../Test/AutoTestData/CNCS_7850_event.nxs");
+//      ld.setPropertyValue("Filename","CNCS_7850_event.nxs");
 //      ld.setPropertyValue("OutputWorkspace",outws_name);
 //      ld.setPropertyValue("FilterByTof_Min", "-1e6");
 //      ld.setPropertyValue("FilterByTof_Max", "1e6");
@@ -216,7 +216,7 @@ public:
 
 //      CNCS_7850_event.nxs should be replaced by CNCS_7860_event.nxs and check if you need to change anything else
 
-//      ld->setPropertyValue("Filename","../../../../Test/AutoTestData/CNCS_7850_event.nxs");
+//      ld->setPropertyValue("Filename","CNCS_7850_event.nxs");
 //      ld->setPropertyValue("OutputWorkspace",outws_name);
 //      ld->setPropertyValue("FilterByTof_Min", "-1e6");
 //      ld->setPropertyValue("FilterByTof_Max", "1e6");
@@ -249,7 +249,7 @@ public:
 
 //      CNCS_7850_event.nxs should be replaced by CNCS_7860_event.nxs and check if you need to change anything else
 
-//      ld->setPropertyValue("Filename","../../../../Test/AutoTestData/CNCS_7850_event.nxs");
+//      ld->setPropertyValue("Filename","CNCS_7850_event.nxs");
 //      ld->setPropertyValue("OutputWorkspace",outws_name);
 //      ld->setPropertyValue("FilterByTof_Min", "-1e6");
 //      ld->setPropertyValue("FilterByTof_Max", "1e6");
diff --git a/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h b/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h
index e6017734fa5190e3dd7de50ec3b09ea7346f71a3..d2f67d286ea7c1ef05ab6df13759210b7867a693 100644
--- a/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h
@@ -39,8 +39,8 @@ public:
   //-----------------------------------------------------------------------------------------------
   void testExec_Event_CNCS()
   {
-    std::string eventfile1( "../../../../Test/AutoTestData/CNCS_7860_neutron_event.dat" );
-    std::string eventfile2( "../../../../Test/AutoTestData/CNCS_7860_neutron_event.dat" );
+    std::string eventfile1( "CNCS_7860_neutron_event.dat" );
+    std::string eventfile2( "CNCS_7860_neutron_event.dat" );
     DataHandling::LoadEventPreNeXus * eventLoader;
 
     TimeSeriesProperty<double>* log;
@@ -51,7 +51,7 @@ public:
 
     eventLoader = new DataHandling::LoadEventPreNeXus(); eventLoader->initialize();
     eventLoader->setPropertyValue("EventFilename", eventfile1);
-    eventLoader->setPropertyValue("MappingFilename", "../../../../Test/AutoTestData/CNCS_TS_2008_08_18.dat");
+    eventLoader->setPropertyValue("MappingFilename", "CNCS_TS_2008_08_18.dat");
     eventLoader->setPropertyValue("OutputWorkspace", "cncs1");
     eventLoader->setProperty("PadEmptyPixels", true);
     TS_ASSERT( eventLoader->execute() );
@@ -66,7 +66,7 @@ public:
     //For the second one, we wont pad the pixels
     eventLoader = new DataHandling::LoadEventPreNeXus(); eventLoader->initialize();
     eventLoader->setPropertyValue("EventFilename", eventfile2);
-    eventLoader->setPropertyValue("MappingFilename", "../../../../Test/AutoTestData/CNCS_TS_2008_08_18.dat");
+    eventLoader->setPropertyValue("MappingFilename", "CNCS_TS_2008_08_18.dat");
     eventLoader->setPropertyValue("OutputWorkspace", "cncs2");
     eventLoader->setProperty("PadEmptyPixels", false);
     TS_ASSERT( eventLoader->execute() );
diff --git a/Code/Mantid/Framework/Algorithms/test/MultiplyRangeTest.h b/Code/Mantid/Framework/Algorithms/test/MultiplyRangeTest.h
index 568994f1a328629369f14d111a29fa234365c495..c0af957f3db8adc0e7d026c4bf1f0761217ade08 100644
--- a/Code/Mantid/Framework/Algorithms/test/MultiplyRangeTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MultiplyRangeTest.h
@@ -38,7 +38,7 @@ public:
 
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/OFFSPEC00004622.raw");
+    loader.setPropertyValue("Filename","OFFSPEC00004622.raw");
     loader.setPropertyValue("OutputWorkspace","tomultiply");
     loader.setPropertyValue("SpectrumList","1");
     loader.setPropertyValue("LoadLogFiles","0");
diff --git a/Code/Mantid/Framework/Algorithms/test/MuonAlphaCalcTest.h b/Code/Mantid/Framework/Algorithms/test/MuonAlphaCalcTest.h
index e6a9f03d9c056afa467855efba9b83e199875964..aee1890302732243a25db0b6866f02f9058d6c0d 100644
--- a/Code/Mantid/Framework/Algorithms/test/MuonAlphaCalcTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MuonAlphaCalcTest.h
@@ -43,7 +43,7 @@ public:
 
     //Load the muon nexus file
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/emu00006473.nxs");
+    loader.setPropertyValue("Filename", "emu00006473.nxs");
     loader.setPropertyValue("OutputWorkspace", "EMU6473");
     TS_ASSERT_THROWS_NOTHING( loader.execute() );
     TS_ASSERT_EQUALS(loader.isExecuted(),true);
@@ -75,7 +75,7 @@ public:
 
     //Load the muon nexus file
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/emu00006473.nxs");
+    loader.setPropertyValue("Filename", "emu00006473.nxs");
     loader.setPropertyValue("OutputWorkspace", "EMU6473");
     TS_ASSERT_THROWS_NOTHING( loader.execute() );
     TS_ASSERT_EQUALS(loader.isExecuted(),true);
diff --git a/Code/Mantid/Framework/Algorithms/test/MuonAsymmetryCalcTest.h b/Code/Mantid/Framework/Algorithms/test/MuonAsymmetryCalcTest.h
index 9b19071be9654cfd7b220c9cd1736d6afbb7be26..e55b45fe6fb0c91b12bd1f56260c124a02ec440a 100644
--- a/Code/Mantid/Framework/Algorithms/test/MuonAsymmetryCalcTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MuonAsymmetryCalcTest.h
@@ -43,7 +43,7 @@ public:
 
     //Load the muon nexus file
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/emu00006473.nxs");
+    loader.setPropertyValue("Filename", "emu00006473.nxs");
     loader.setPropertyValue("OutputWorkspace", "EMU6473");
     TS_ASSERT_THROWS_NOTHING( loader.execute() );
     TS_ASSERT_EQUALS(loader.isExecuted(),true);
diff --git a/Code/Mantid/Framework/Algorithms/test/MuonRemoveExpDecayTest.h b/Code/Mantid/Framework/Algorithms/test/MuonRemoveExpDecayTest.h
index 82c1358be4fa1702bdcaedcddea47c556a3f34a8..ea1efd54edc46b7ec27ff01cbd95bbc2b3ce2f16 100644
--- a/Code/Mantid/Framework/Algorithms/test/MuonRemoveExpDecayTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MuonRemoveExpDecayTest.h
@@ -40,7 +40,7 @@ public:
 #ifndef _WIN64
 
     loader.initialize();
-    loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/emu00006473.nxs");
+    loader.setPropertyValue("Filename", "emu00006473.nxs");
     loader.setPropertyValue("OutputWorkspace", "EMU6473");
     TS_ASSERT_THROWS_NOTHING( loader.execute() );
     TS_ASSERT_EQUALS(loader.isExecuted(),true);
diff --git a/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h b/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
index 18daeced51d8f0d99636b2fa1f5153426bc1137f..31e37b81fa21a3eaefb35b3d89279a3934391ae1 100644
--- a/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
@@ -20,7 +20,7 @@ class PlotAsymmetryByLogValueTest : public CxxTest::TestSuite
 public:
 
     PlotAsymmetryByLogValueTest()
-      :firstRun("../../../../Test/AutoTestData/MUSR00015189.nxs"),lastRun("../../../../Test/AutoTestData/MUSR00015199.nxs")
+      :firstRun("MUSR00015189.nxs"),lastRun("MUSR00015199.nxs")
     {
     }
 
diff --git a/Code/Mantid/Framework/Algorithms/test/Q1DTest.h b/Code/Mantid/Framework/Algorithms/test/Q1DTest.h
index 0f02cd3d658e8f2206ecb5885be86e9656031fee..0cd743b2180dc48631e7f989755d6a912e52f096 100644
--- a/Code/Mantid/Framework/Algorithms/test/Q1DTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/Q1DTest.h
@@ -37,7 +37,7 @@ public:
   {
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/LOQ48127.raw");
+    loader.setPropertyValue("Filename","LOQ48127.raw");
     const std::string inputWS("wav");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.setPropertyValue("SpectrumList","3");
diff --git a/Code/Mantid/Framework/Algorithms/test/Q1DWeightedTest.h b/Code/Mantid/Framework/Algorithms/test/Q1DWeightedTest.h
index 09b6db1fdb9c19cd76e26a04aa737a98ba5cc3af..f205af43326006976cadf686684c7f5c41e3c3ea 100644
--- a/Code/Mantid/Framework/Algorithms/test/Q1DWeightedTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/Q1DWeightedTest.h
@@ -39,7 +39,7 @@ public:
   {
     Mantid::DataHandling::LoadSpice2D loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/BioSANS_exp61_scan0004_0001.xml");
+    loader.setPropertyValue("Filename","BioSANS_exp61_scan0004_0001.xml");
     const std::string inputWS("wav");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/QxyTest.h b/Code/Mantid/Framework/Algorithms/test/QxyTest.h
index 4fc6bff780c3c04535910486e37eafcb8c7feaf7..8e7f1d22ec03aba870651c1f289c6c7836c8eb45 100644
--- a/Code/Mantid/Framework/Algorithms/test/QxyTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/QxyTest.h
@@ -37,7 +37,7 @@ public:
   {
     Mantid::DataHandling::LoadRaw2 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/LOQ48098.raw");
+    loader.setPropertyValue("Filename","LOQ48098.raw");
     loader.setPropertyValue("OutputWorkspace",m_inputWS);
     loader.setPropertyValue("SpectrumMin","30");
     loader.setPropertyValue("SpectrumMax","130");
diff --git a/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h b/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h
index 7f763c04aae647fe1dbd0f6554a7a723b45fd6ec..397a13621dd77b640fcf6c261c383b7983d35bdd 100644
--- a/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h
@@ -187,7 +187,7 @@ public:
 #ifndef _WIN64
 		Mantid::NeXus::LoadMuonNexus loader;
 		loader.initialize();
-		loader.setPropertyValue("Filename", "../../../../Test/AutoTestData/emu00006473.nxs");
+		loader.setPropertyValue("Filename", "emu00006473.nxs");
 		loader.setPropertyValue("OutputWorkspace", "EMU6473");
 		loader.execute();
 		
diff --git a/Code/Mantid/Framework/Algorithms/test/SofQWTest.h b/Code/Mantid/Framework/Algorithms/test/SofQWTest.h
index d41c4487cf708b7e1141bad646421dfb05faa33c..e69774422cdd4722ff9279e252c14fa33b3002a7 100644
--- a/Code/Mantid/Framework/Algorithms/test/SofQWTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/SofQWTest.h
@@ -39,7 +39,7 @@ public:
 
     Mantid::NeXus::LoadNexusProcessed loader;
     loader.initialize();
-    loader.setProperty("Filename","../../../../Test/AutoTestData/IRS26173_ipg.nxs");
+    loader.setProperty("Filename","IRS26173_ipg.nxs");
     const std::string inputWS = "inputWS";
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/SolidAngleCorrectionTest.h b/Code/Mantid/Framework/Algorithms/test/SolidAngleCorrectionTest.h
index 7ba9f25d6b9666fd259ceb88e141aa30a3ab60f9..618c656d68b0aa464099ed96ee5f67fb41c72437 100644
--- a/Code/Mantid/Framework/Algorithms/test/SolidAngleCorrectionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/SolidAngleCorrectionTest.h
@@ -37,7 +37,7 @@ public:
   {
     Mantid::DataHandling::LoadSpice2D loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/BioSANS_exp61_scan0004_0001.xml");
+    loader.setPropertyValue("Filename","BioSANS_exp61_scan0004_0001.xml");
     const std::string inputWS("wav");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/StripVanadiumPeaksTest.h b/Code/Mantid/Framework/Algorithms/test/StripVanadiumPeaksTest.h
index a2c928c907c46e3245449afa52f01e0c8ade38a4..26be7e7981317248b22e55b8b30debe1ccd5b3c5 100644
--- a/Code/Mantid/Framework/Algorithms/test/StripVanadiumPeaksTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/StripVanadiumPeaksTest.h
@@ -38,7 +38,7 @@ public:
 
     // Start by loading our NXS file
     IAlgorithm* loader = Mantid::API::FrameworkManager::Instance().createAlgorithm("LoadNexus");
-    loader->setPropertyValue("Filename","../../../../Test/AutoTestData/PG3_733.nxs");
+    loader->setPropertyValue("Filename","PG3_733.nxs");
     loader->setPropertyValue("OutputWorkspace", inputWSName);
     loader->execute();
     TS_ASSERT( loader->isExecuted());
diff --git a/Code/Mantid/Framework/Algorithms/test/SumRowColumnTest.h b/Code/Mantid/Framework/Algorithms/test/SumRowColumnTest.h
index 3ac2ddbb4d3bf2c375e2703fc5f47ec8a8414235..2f16a578212ef3b519710c87db9dcedd9be1532b 100644
--- a/Code/Mantid/Framework/Algorithms/test/SumRowColumnTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/SumRowColumnTest.h
@@ -15,7 +15,7 @@ public:
   {
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/LOQ48094.raw");
+    loader.setPropertyValue("Filename","LOQ48094.raw");
     loader.setPropertyValue("OutputWorkspace",inputWS);
     loader.setPropertyValue("SpectrumMin","3");
     loader.setPropertyValue("SpectrumMax","16386");
diff --git a/Code/Mantid/Framework/Algorithms/test/SumSpectraTest.h b/Code/Mantid/Framework/Algorithms/test/SumSpectraTest.h
index 47018888871bcd4e68326f3d9e0e7e1420fe0240..c081023ebf42b91742529e6a95cbadc6bdccb823 100644
--- a/Code/Mantid/Framework/Algorithms/test/SumSpectraTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/SumSpectraTest.h
@@ -30,7 +30,7 @@ public:
 
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/LOQ48127.raw");
+    loader.setPropertyValue("Filename","LOQ48127.raw");
     loader.setPropertyValue("OutputWorkspace",inputSpace);
     loader.execute();
 
diff --git a/Code/Mantid/Framework/Algorithms/test/TofCorrectionTest.h b/Code/Mantid/Framework/Algorithms/test/TofCorrectionTest.h
index c52b2491a2552e988dde00f8b3d0cf76bb315580..79450aeec9e61fcef9050799632e4a8d93863f10 100644
--- a/Code/Mantid/Framework/Algorithms/test/TofCorrectionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/TofCorrectionTest.h
@@ -43,7 +43,7 @@ public:
     IAlgorithm* loader;
     loader = new Mantid::DataHandling::LoadRaw3;
     loader->initialize();
-    loader->setPropertyValue("Filename", "../../../../Test/AutoTestData/TSC10076.raw");
+    loader->setPropertyValue("Filename", "TSC10076.raw");
     loader->setPropertyValue("OutputWorkspace", "tofcorrection_tsc_r");
     loader->setPropertyValue("SpectrumMin", "13");
     loader->setPropertyValue("SpectrumMax", "13");
diff --git a/Code/Mantid/Framework/Algorithms/test/TransposeTest.h b/Code/Mantid/Framework/Algorithms/test/TransposeTest.h
index a54a60fd65eecc9903e7a9ffb301138de4345241..771370b9917effd54a0f6d66cc07c89da380ecad 100644
--- a/Code/Mantid/Framework/Algorithms/test/TransposeTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/TransposeTest.h
@@ -43,7 +43,7 @@ public:
     IAlgorithm* loader;
     loader = new Mantid::DataHandling::LoadRaw;
     loader->initialize();
-    loader->setPropertyValue("Filename", "../../../../Test/AutoTestData/IRS21360.raw");
+    loader->setPropertyValue("Filename", "IRS21360.raw");
     loader->setPropertyValue("OutputWorkspace", "transpose_irs_r");
     loader->setPropertyValue("SpectrumMin", "3");
     loader->setPropertyValue("SpectrumMax", "13");
diff --git a/Code/Mantid/Framework/Algorithms/test/UnGroupWorkspacesTest.h b/Code/Mantid/Framework/Algorithms/test/UnGroupWorkspacesTest.h
index 52d0366bd9d5f9b8f547dbc67e25c1d0920aae81..c43e297b2b758c6e1ea7a6c1cacff6bb4a6af18f 100644
--- a/Code/Mantid/Framework/Algorithms/test/UnGroupWorkspacesTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/UnGroupWorkspacesTest.h
@@ -49,7 +49,7 @@ public:
 	{
 		LoadRaw3 alg;
 		alg.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","../../../../Test/AutoTestData/EVS13895.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","EVS13895.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("OutputWorkspace","EVS13895"));
 		TS_ASSERT_THROWS_NOTHING( alg.execute());
 		TS_ASSERT( alg.isExecuted() );
@@ -81,7 +81,7 @@ public:
 	{
 	  	LoadRaw3 alg;
 		alg.initialize();
-		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","../../../../Test/AutoTestData/LOQ48098.raw"));
+		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("FileName","LOQ48098.raw"));
 		TS_ASSERT_THROWS_NOTHING(alg.setPropertyValue("OutputWorkspace","LOQ48098"));
 		TS_ASSERT_THROWS_NOTHING( alg.execute());
 		TS_ASSERT( alg.isExecuted() );
diff --git a/Code/Mantid/Framework/Algorithms/test/UnwrapTest.h b/Code/Mantid/Framework/Algorithms/test/UnwrapTest.h
index 7a6f7558aa4a42fe841a3f6d5cf6706f5489dbbd..ce388c31a4d78eebff003eccb8b12c130971670d 100644
--- a/Code/Mantid/Framework/Algorithms/test/UnwrapTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/UnwrapTest.h
@@ -54,7 +54,7 @@ public:
   {
     IAlgorithm* loader = new Mantid::DataHandling::LoadRaw2;
     loader->initialize();
-    loader->setPropertyValue("Filename", "../../../../Test/AutoTestData/OSI11886.raw");
+    loader->setPropertyValue("Filename", "OSI11886.raw");
 
     std::string outputSpace = "toUnwrap";
     loader->setPropertyValue("OutputWorkspace", outputSpace);
diff --git a/Code/Mantid/Framework/Algorithms/test/WeightedMeanTest.h b/Code/Mantid/Framework/Algorithms/test/WeightedMeanTest.h
index 82b041db868707b996db9f9e20d9b71a2479fb6e..7ce08fee536f84499e0e12e77ce952adbb434134 100644
--- a/Code/Mantid/Framework/Algorithms/test/WeightedMeanTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/WeightedMeanTest.h
@@ -38,7 +38,7 @@ public:
 
     Mantid::DataHandling::LoadRaw3 loader;
     loader.initialize();
-    loader.setPropertyValue("Filename","../../../../Test/AutoTestData/OFFSPEC00004622.raw");
+    loader.setPropertyValue("Filename","OFFSPEC00004622.raw");
     loader.setPropertyValue("OutputWorkspace","first");
     loader.setPropertyValue("SpectrumList","1");
     loader.setPropertyValue("LoadLogFiles","0");
@@ -46,7 +46,7 @@ public:
 
     Mantid::DataHandling::LoadRaw3 loader2;
     loader2.initialize();
-    loader2.setPropertyValue("Filename","../../../../Test/AutoTestData/OFFSPEC00004622.raw");
+    loader2.setPropertyValue("Filename","OFFSPEC00004622.raw");
     loader2.setPropertyValue("OutputWorkspace","second");
     loader2.setPropertyValue("SpectrumList","2");
     loader2.setPropertyValue("LoadLogFiles","0");