diff --git a/docs/source/concepts/AbinsImplementation.rst b/docs/source/concepts/AbinsImplementation.rst
index fec01bfa7315cb7283cc82d7f41e7a098571df90..ab88934a783e53affa612b1088dc62a1291a41d5 100644
--- a/docs/source/concepts/AbinsImplementation.rst
+++ b/docs/source/concepts/AbinsImplementation.rst
@@ -101,14 +101,12 @@ Testing
 
 Tests for Abins are located in a few places:
 
-Algorithm tests
-~~~~~~~~~~~~~~~
-
 Unit tests
 ~~~~~~~~~~
-Unit tests for the AbinsModules Python library are in *scripts/test/Abins*.
+Unit tests for the Python AbinsModules are in *scripts/test/Abins*.
 These are set up with the other unit tests (``cmake --build . --target AllTests``)
 and can be run by filtering for Abins (``ctest -R Abins``).
+This will also run the Algorithm tests (next section).
 
 Some of these tests load input data and check that the
 structure/vibration data has been read correctly. There is a
@@ -125,9 +123,17 @@ Loader and pass it to *save_ab_initio_test_data*. This takes two lines of Python
 which will write the necessary *my_new_test_data.txt* file and
 *my_new_test_atomic_displacements_data_{k}.txt* files for each phonon wavevector.
 
+Algorithm tests
+~~~~~~~~~~~~~~~
+Tests of the main Abins algorithm and of the advanced parameter
+settings are in
+*Framework/PythonInterface/test/python/plugins/algorithms*. These
+mostly cover input sanity-checking, and check the consistency of
+result scaling and splitting into atomic contributions.
 
 System tests
 ~~~~~~~~~~~~
-
+System tests are defined in *Testing/SystemTests/tests/analysis/AbinsTest.py*.
+These tests compare the output workspaces of Abins runs with reference Nexus files.
 
 .. categories:: Concepts
diff --git a/scripts/test/Abins/CMakeLists.txt b/scripts/test/Abins/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b55939d572def47bcb0f8a3a9274fa56e00fb1fc
--- /dev/null
+++ b/scripts/test/Abins/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Tests for Abins INS simulation
+set ( TEST_PY_FILES
+   AbinsAtomsDataTest.py
+   AbinsBroadeningTest.py
+   AbinsCalculateDWSingleCrystalTest.py
+   AbinsCalculatePowderTest.py
+   AbinsCalculateQToscaTest.py
+   AbinsCalculateSingleCrystalTest.py
+   AbinsCalculateSPowderTest.py
+   AbinsDWSingleCrystalDataTest.py
+   AbinsFrequencyPowderGeneratorTest.py
+   AbinsIOmoduleTest.py
+   AbinsKpointsDataTest.py
+   AbinsLoadCASTEPTest.py
+   AbinsLoadCRYSTALTest.py
+   AbinsLoadDMOL3Test.py
+   AbinsLoadGAUSSIANTest.py
+   AbinsPowderDataTest.py
+  )
+
+pyunittest_add_test(${CMAKE_CURRENT_SOURCE_DIR} python.scripts
+  ${TEST_PY_FILES})
diff --git a/scripts/test/Abins/__init__.py b/scripts/test/Abins/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/scripts/test/CMakeLists.txt b/scripts/test/CMakeLists.txt
index 3bc1e07fd377d880236a3b64e6fc8907ddc59a55..482ef7c0b5c93d0fc06b387340e855701607e3e5 100644
--- a/scripts/test/CMakeLists.txt
+++ b/scripts/test/CMakeLists.txt
@@ -1,19 +1,4 @@
 set(TEST_PY_FILES
-    AbinsAtomsDataTest.py
-    AbinsCalculateDWSingleCrystalTest.py
-    AbinsCalculatePowderTest.py
-    AbinsCalculateQToscaTest.py
-    AbinsCalculateSingleCrystalTest.py
-    AbinsCalculateSPowderTest.py
-    AbinsDWSingleCrystalDataTest.py
-    AbinsFrequencyPowderGeneratorTest.py
-    AbinsIOmoduleTest.py
-    AbinsKpointsDataTest.py
-    AbinsLoadCASTEPTest.py
-    AbinsLoadCRYSTALTest.py
-    AbinsLoadDMOL3Test.py
-    AbinsLoadGAUSSIANTest.py
-    AbinsPowderDataTest.py
     AbsorptionShapesTest.py 	
     ConvertToWavelengthTest.py
     CrystalFieldMultiSiteTest.py
@@ -60,6 +45,7 @@ unset(PYUNITTEST_QT_API)
 
 
 # Additional tests
+add_subdirectory(Abins)
 add_subdirectory(directtools)
 add_subdirectory(MultiPlotting)
 add_subdirectory(Muon)