diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index b096bbade445e91a238154e4abe250d7a1b6ff8e..c213cef13a5ce5458ad6a10d7d33b64589e41f20 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -86,6 +86,7 @@ install(FILES ${_scripts_pth_install}
 
 # Testing
 add_subdirectory(test)
+add_subdirectory(Diffraction/isis_powder)
 
 # Ensure we don't get stale pyc files around
 clean_orphaned_pyc_files(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/scripts/Diffraction/isis_powder/CMakeLists.txt b/scripts/Diffraction/isis_powder/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..245d5f2ba81f11e00fb7470de6069336547a88a2
--- /dev/null
+++ b/scripts/Diffraction/isis_powder/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Tests for ISIS Powder
+
+set(TEST_PY_FILES
+    test/ISISPowderAbsorptionTest.py
+    test/ISISPowderAbstractInstrumentTest.py
+    test/ISISPowderCommonTest.py
+    test/ISISPowderGemOutputTest.py
+    test/ISISPowderInstrumentSettingsTest.py
+    test/ISISPowderRunDetailsTest.py
+    test/ISISPowderSampleDetailsTest.py
+    test/ISISPowderYamlParserTest.py
+    test/ISISPowderFocusCropTest.py
+)
+
+check_tests_valid(${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES})
+
+pyunittest_add_test(${CMAKE_CURRENT_SOURCE_DIR} python.IsisPowder
+                    ${TEST_PY_FILES})
diff --git a/scripts/test/isis_powder/ISISPowderAbsorptionTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderAbsorptionTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderAbsorptionTest.py
diff --git a/scripts/test/isis_powder/ISISPowderAbstractInstrumentTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderAbstractInstrumentTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderAbstractInstrumentTest.py
diff --git a/scripts/test/isis_powder/ISISPowderCommonTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderCommonTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderCommonTest.py
diff --git a/scripts/test/isis_powder/ISISPowderFocusCropTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderFocusCropTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderFocusCropTest.py
diff --git a/scripts/test/isis_powder/ISISPowderGemOutputTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderGemOutputTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderGemOutputTest.py
diff --git a/scripts/test/isis_powder/ISISPowderInstrumentSettingsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderInstrumentSettingsTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderInstrumentSettingsTest.py
diff --git a/scripts/test/isis_powder/ISISPowderRunDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderRunDetailsTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderRunDetailsTest.py
diff --git a/scripts/test/isis_powder/ISISPowderSampleDetailsTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderSampleDetailsTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderSampleDetailsTest.py
diff --git a/scripts/test/isis_powder/ISISPowderYamlParserTest.py b/scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
similarity index 100%
rename from scripts/test/isis_powder/ISISPowderYamlParserTest.py
rename to scripts/Diffraction/isis_powder/test/ISISPowderYamlParserTest.py
diff --git a/scripts/Diffraction/isis_powder/test/__init__.py b/scripts/Diffraction/isis_powder/test/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..d43ca442a3b069de62b966ee9f1e47beadcb570c
--- /dev/null
+++ b/scripts/Diffraction/isis_powder/test/__init__.py
@@ -0,0 +1,6 @@
+# Mantid Repository : https://github.com/mantidproject/mantid
+#
+# Copyright © 2019 ISIS Rutherford Appleton Laboratory UKRI,
+#     NScD Oak Ridge National Laboratory, European Spallation Source
+#     & Institut Laue - Langevin
+# SPDX - License - Identifier: GPL - 3.0 +
diff --git a/scripts/test/CMakeLists.txt b/scripts/test/CMakeLists.txt
index 29dcaeb11f27b7d5d38148fb6928b2af70d2cbdf..0e0ada5db78e398284794f0b5d3e3fa22e912276 100644
--- a/scripts/test/CMakeLists.txt
+++ b/scripts/test/CMakeLists.txt
@@ -60,7 +60,6 @@ unset(PYUNITTEST_QT_API)
 
 # Additional tests
 add_subdirectory(directtools)
-add_subdirectory(isis_powder)
 add_subdirectory(MultiPlotting)
 add_subdirectory(Muon)
 add_subdirectory(SANS)
diff --git a/scripts/test/isis_powder/CMakeLists.txt b/scripts/test/isis_powder/CMakeLists.txt
deleted file mode 100644
index 0947470963bd07e4c897b63a2310cc29ea6ed8b1..0000000000000000000000000000000000000000
--- a/scripts/test/isis_powder/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Tests for ISIS Powder
-
-set(TEST_PY_FILES
-    ISISPowderAbsorptionTest.py
-    ISISPowderAbstractInstrumentTest.py
-    ISISPowderCommonTest.py
-    ISISPowderGemOutputTest.py
-    ISISPowderInstrumentSettingsTest.py
-    ISISPowderRunDetailsTest.py
-    ISISPowderSampleDetailsTest.py
-    ISISPowderYamlParserTest.py
-    ISISPowderFocusCropTest.py)
-
-check_tests_valid(${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES})
-
-# Prefix for test name=PythonAlgorithms
-pyunittest_add_test(${CMAKE_CURRENT_SOURCE_DIR} python.IsisPowder
-                    ${TEST_PY_FILES})