diff --git a/unit-tests/CMakeLists.txt b/unit-tests/CMakeLists.txt
index 7602f37e849..2bace7919a9 100644
--- a/unit-tests/CMakeLists.txt
+++ b/unit-tests/CMakeLists.txt
@@ -29,7 +29,6 @@ endif()
 
 set (unit_tests_sources
     unit-tests-live.cpp
-    unit-tests-hdr.cpp
     unit-tests-regressions.cpp
     unit-tests-post-processing.cpp
     unit-tests-post-processing.h
diff --git a/unit-tests/unit-tests-hdr.cpp b/unit-tests/hdr/test-hdr.cpp
similarity index 99%
rename from unit-tests/unit-tests-hdr.cpp
rename to unit-tests/hdr/test-hdr.cpp
index 9783bf38569..94a976e76a9 100644
--- a/unit-tests/unit-tests-hdr.cpp
+++ b/unit-tests/hdr/test-hdr.cpp
@@ -1,12 +1,17 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2020 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2021 Intel Corporation. All Rights Reserved.
 
 /////////////////////////////////////////////////////////////////////////////
 // This set of tests is valid for any device that supports the HDR feature //
 /////////////////////////////////////////////////////////////////////////////
 
+//#cmake:add-file ../unit-tests-common.h
+//#cmake:add-file ../approx.h
+
+#define CATCH_CONFIG_MAIN
+#include "../catch.h"
+#include "../unit-tests-common.h"
 
-#include "unit-tests-common.h"
 
 using namespace rs2;