diff --git a/tests/sys_atomic_utils_unittests/Makefile b/tests/sys_atomic_utils_unittests/Makefile
new file mode 100644
index 0000000000..d783512760
--- /dev/null
+++ b/tests/sys_atomic_utils_unittests/Makefile
@@ -0,0 +1,7 @@
+include ../Makefile.tests_common
+
+USEMODULE += embunit
+USEMODULE += atomic_utils
+USEMODULE += random # <-- used for input data to operate on
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/unittests/tests-atomic_utils/tests-atomic_utils.c b/tests/sys_atomic_utils_unittests/main.c
similarity index 99%
rename from tests/unittests/tests-atomic_utils/tests-atomic_utils.c
rename to tests/sys_atomic_utils_unittests/main.c
index ab1a6cb559..ba1cbf1bb4 100644
--- a/tests/unittests/tests-atomic_utils/tests-atomic_utils.c
+++ b/tests/sys_atomic_utils_unittests/main.c
@@ -7,6 +7,7 @@
  */
 
 /**
+ * @ingroup     tests
  * @{
  *
  * @file
@@ -20,7 +21,6 @@
 #include <string.h>
 
 #include "embUnit.h"
-#include "tests-atomic_utils.h"
 
 #include "atomic_utils.h"
 #include "random.h"
@@ -280,7 +280,11 @@ Test *tests_atomic_utils_tests(void)
     return (Test *)&atomic_utils_tests;
 }
 
-void tests_atomic_utils(void)
+int main(void)
 {
+    TESTS_START();
     TESTS_RUN(tests_atomic_utils_tests());
+    TESTS_END();
+
+    return 0;
 }
diff --git a/tests/sys_atomic_utils_unittests/tests/01-run.py b/tests/sys_atomic_utils_unittests/tests/01-run.py
new file mode 100755
index 0000000000..8347dd8887
--- /dev/null
+++ b/tests/sys_atomic_utils_unittests/tests/01-run.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+
+#  Copyright (C) 2020 Inria
+#
+# This file is subject to the terms and conditions of the GNU Lesser
+# General Public License v2.1. See the file LICENSE in the top level
+# directory for more details.
+
+import sys
+
+from testrunner import run_check_unittests
+
+if __name__ == "__main__":
+    sys.exit(run_check_unittests())
diff --git a/tests/unittests/tests-atomic_utils/Makefile b/tests/unittests/tests-atomic_utils/Makefile
deleted file mode 100644
index 48422e909a..0000000000
--- a/tests/unittests/tests-atomic_utils/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include $(RIOTBASE)/Makefile.base
diff --git a/tests/unittests/tests-atomic_utils/Makefile.include b/tests/unittests/tests-atomic_utils/Makefile.include
deleted file mode 100644
index 527faa4e06..0000000000
--- a/tests/unittests/tests-atomic_utils/Makefile.include
+++ /dev/null
@@ -1,2 +0,0 @@
-USEMODULE += atomic_utils
-USEMODULE += random # <-- used for input data to operate on
diff --git a/tests/unittests/tests-atomic_utils/tests-atomic_utils.h b/tests/unittests/tests-atomic_utils/tests-atomic_utils.h
deleted file mode 100644
index eaacee1ae3..0000000000
--- a/tests/unittests/tests-atomic_utils/tests-atomic_utils.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2020 Otto-von-Guericke-Universität Magdeburg
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @addtogroup  unittests
- * @{
- *
- * @file
- * @brief       Unittests for the atomic util module
- *
- * @author      Marian Buschsieweke <marian.buschsieweke@ovgu.de>
- */
-
-#ifndef TESTS_ATOMIC_UTILS_H
-#define TESTS_ATOMIC_UTILS_H
-
-#include "embUnit.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief   The entry point of this test suite.
- */
-void tests_atomic_util(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* TESTS_ATOMIC_UTILS_H */
-/** @} */