diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58253cd..2510ba3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -472,6 +472,7 @@ if(AARE_TESTS)
             ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithm.test.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/src/defs.test.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/src/to_string.test.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/scan_parameters.test.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/src/decode.test.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/src/Dtype.test.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/src/Frame.test.cpp
diff --git a/src/RawMasterFile.test.cpp b/src/RawMasterFile.test.cpp
index 0e75ec4..0bb348b 100644
--- a/src/RawMasterFile.test.cpp
+++ b/src/RawMasterFile.test.cpp
@@ -46,25 +46,6 @@ TEST_CASE("Master file name does not fit pattern") {
     REQUIRE_THROWS(RawFileNameComponents("test_master_1.txt"));
 }
 
-TEST_CASE("Parse scan parameters") {
-    ScanParameters s("[enabled\ndac dac 4\nstart 500\nstop 2200\nstep "
-                     "5\nsettleTime 100us\n]");
-    REQUIRE(s.enabled());
-    REQUIRE(s.dac() == "dac 4");
-    REQUIRE(s.start() == 500);
-    REQUIRE(s.stop() == 2200);
-    REQUIRE(s.step() == 5);
-}
-
-TEST_CASE("A disabled scan") {
-    ScanParameters s("[disabled]");
-    REQUIRE_FALSE(s.enabled());
-    REQUIRE(s.dac() == "");
-    REQUIRE(s.start() == 0);
-    REQUIRE(s.stop() == 0);
-    REQUIRE(s.step() == 0);
-}
-
 TEST_CASE("Parse a master file in .json format", "[.integration]") {
     auto fpath =
         test_data_path() / "jungfrau" / "jungfrau_single_master_0.json";
diff --git a/src/scan_parameters.test.cpp b/src/scan_parameters.test.cpp
new file mode 100644
index 0000000..df387ca
--- /dev/null
+++ b/src/scan_parameters.test.cpp
@@ -0,0 +1,24 @@
+#include "aare/scan_parameters.hpp"
+
+#include <catch2/catch_test_macros.hpp>
+
+using namespace aare;
+
+TEST_CASE("Parse scan parameters") {
+    ScanParameters s("[enabled\ndac dac 4\nstart 500\nstop 2200\nstep "
+                     "5\nsettleTime 100us\n]");
+    REQUIRE(s.enabled());
+    REQUIRE(s.dac() == "dac 4");
+    REQUIRE(s.start() == 500);
+    REQUIRE(s.stop() == 2200);
+    REQUIRE(s.step() == 5);
+}
+
+TEST_CASE("A disabled scan") {
+    ScanParameters s("[disabled]");
+    REQUIRE_FALSE(s.enabled());
+    REQUIRE(s.dac() == "");
+    REQUIRE(s.start() == 0);
+    REQUIRE(s.stop() == 0);
+    REQUIRE(s.step() == 0);
+}