diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-acquire.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-acquire.cpp
index ad755d08a..b0dea845e 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-acquire.cpp
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-acquire.cpp
@@ -2,11 +2,6 @@
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 #include "Caller.h"
 #include "catch.hpp"
-#include "sls/Detector.h"
-#include "sls/sls_detector_defs.h"
-#include "sls/versionAPI.h"
-#include "test-Caller-global.h"
-#include "tests/globals.h"
 
 #include "acquire/Acquire.h"
 #include "acquire/CTBState.h"
@@ -14,17 +9,11 @@
 #include "acquire/FileState.h"
 #include "checks/MasterFileChecks.h"
 
-#include <filesystem>
-#include <sstream>
-
 namespace sls {
 
 namespace acq = sls::test::acquire;
 namespace checks = sls::test::checks;
 
-using test::GET;
-using test::PUT;
-
 void acquire_and_check_file_size(
     Detector &det, const acq::CTBState &ctb_state = acq::default_ctb_state()) {
     auto acq_state = acq::default_acquisition_state();
diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp
index 9bfbc5a29..b4f3dda0e 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp
@@ -3,11 +3,12 @@
 #include "test-Caller-global.h"
 #include "Caller.h"
 #include "GeneralData.h"
-#include "catch.hpp"
 #include "sls/Detector.h"
 #include "sls/logger.h"
 #include "tests/globals.h"
 
+#include "catch.hpp"
+
 namespace sls {
 
 namespace acq = sls::test::acquire;
diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-global.h b/slsDetectorSoftware/tests/Caller/test-Caller-global.h
index d389f8598..47e3d7c19 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-global.h
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-global.h
@@ -2,15 +2,8 @@
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 #pragma once
 
-#include "Caller.h"
-#include "sls/Detector.h"
-#include "sls/ToString.h"
-#include "sls/logger.h"
-#include "sls/sls_detector_defs.h"
-
-#include "acquire/Acquire.h"
 #include "acquire/CTBState.h"
-#include "acquire/FileState.h"
+#include "sls/sls_detector_defs.h"
 
 #include <chrono>
 #include <filesystem>
diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp
index 80b032582..2e8d8a9bd 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp
@@ -1,18 +1,17 @@
 // SPDX-License-Identifier: LGPL-3.0-or-other
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 #include "Caller.h"
-#include "catch.hpp"
 #include "sls/Detector.h"
 #include "sls/Version.h"
-#include "sls/sls_detector_defs.h"
-#include "test-Caller-global.h"
-
-#include <filesystem>
-#include <sstream>
-
 #include "sls/versionAPI.h"
+#include "test-Caller-global.h"
 #include "tests/globals.h"
 
+#include "acquire/Acquire.h"
+#include "acquire/FileState.h"
+
+#include "catch.hpp"
+
 namespace sls {
 
 namespace acq = sls::test::acquire;
diff --git a/slsDetectorSoftware/tests/acquire/ExpectedState.cpp b/slsDetectorSoftware/tests/acquire/ExpectedState.cpp
index 887d01ced..00f979f21 100644
--- a/slsDetectorSoftware/tests/acquire/ExpectedState.cpp
+++ b/slsDetectorSoftware/tests/acquire/ExpectedState.cpp
@@ -274,7 +274,7 @@ build_detector_specific_state(const Detector &det,
     case defs::XILINX_CHIPTESTBOARD:
         return build_ctb_specific_state(det, ctb_state);
     default:
-     throw sls::RuntimeError("Unsupported detector type");
+        throw sls::RuntimeError("Unsupported detector type");
     }
 }
 } // anonymous namespace