diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp
index 3ab7aa0dba..afeb130f68 100644
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@@ -24,8 +24,6 @@
 #include "afm2mapConverter.h"
 #include "test_signal_executor.h"
 #include "trigger_central.h"
-#include "test_startOfCrankingPrimingPulse.h"
-#include "test_fasterEngineSpinningUp.h"
 #include "test_util.h"
 #include "map_resize.h"
 #include "engine_math.h"
@@ -67,9 +65,6 @@ GTEST_API_ int main(int argc, char **argv) {
 	testPidAuto();
 
 	testLogicExpressions(); // fsio
-	testPlainCrankingWithoutAdvancedFeatures();
-	testStartOfCrankingPrimingPulse();
-	testFasterEngineSpinningUp();
 	testGpsParser();
 	testFuelMap();
 	testEngineMath();
diff --git a/unit_tests/tests/test_fasterEngineSpinningUp.cpp b/unit_tests/tests/test_fasterEngineSpinningUp.cpp
index 99de35495f..1a9d6a9fff 100644
--- a/unit_tests/tests/test_fasterEngineSpinningUp.cpp
+++ b/unit_tests/tests/test_fasterEngineSpinningUp.cpp
@@ -5,12 +5,11 @@
  */
 
 #include "engine_math.h"
-#include "test_fasterEngineSpinningUp.h"
 #include "test_trigger_decoder.h"
 
 extern int timeNowUs;
 
-void testFasterEngineSpinningUp() {
+TEST(sensors, testFasterEngineSpinningUp) {
 	// this is just a reference unit test implementation
 	printf("*************************************************** testFasterEngineSpinningUp\r\n");
 
diff --git a/unit_tests/tests/test_fasterEngineSpinningUp.h b/unit_tests/tests/test_fasterEngineSpinningUp.h
deleted file mode 100644
index fd89f7768f..0000000000
--- a/unit_tests/tests/test_fasterEngineSpinningUp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * test_fasterEngineSpinningUp.h
- *
- *  Created on: Mar 6, 2018
- */
-
-#ifndef TEST_FASTERENGINESPINNINGUP_H_
-#define TEST_FASTERENGINESPINNINGUP_H_
-
-#include "global.h"
-
-void testFasterEngineSpinningUp();
-
-#endif /* TEST_FASTERENGINESPINNINGUP_H_ */
diff --git a/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp b/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
index e4b9c8f818..7682464657 100644
--- a/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
+++ b/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
@@ -5,13 +5,12 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
-#include "test_startOfCrankingPrimingPulse.h"
 #include "test_trigger_decoder.h"
 
 extern int timeNowUs;
 extern EnginePins enginePins;
 
-void testPlainCrankingWithoutAdvancedFeatures() {
+TEST(engine, testPlainCrankingWithoutAdvancedFeatures) {
 	// this is just a reference unit test implementation
 	printf("*************************************************** testPlainCrankingWithoutAdvancedFeatures\r\n");
 
@@ -36,7 +35,7 @@ void testPlainCrankingWithoutAdvancedFeatures() {
 }
 
 
-void testStartOfCrankingPrimingPulse() {
+TEST(engine, testStartOfCrankingPrimingPulse) {
 	printf("*************************************************** testStartOfCrankingPrimingPulse\r\n");
 
 	EngineTestHelper eth(TEST_ENGINE);
diff --git a/unit_tests/tests/test_startOfCrankingPrimingPulse.h b/unit_tests/tests/test_startOfCrankingPrimingPulse.h
deleted file mode 100644
index c1d6b65dd0..0000000000
--- a/unit_tests/tests/test_startOfCrankingPrimingPulse.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * test_startOfCrankingPrimingPulse.h
- *
- *  Created on: Mar 4, 2018
- * @author Andrey Belomutskiy, (c) 2012-2018
- */
-
-#ifndef TEST_STARTOFCRANKINGPRIMINGPULSE_H_
-#define TEST_STARTOFCRANKINGPRIMINGPULSE_H_
-
-#include "global.h"
-
-void testPlainCrankingWithoutAdvancedFeatures();
-void testStartOfCrankingPrimingPulse();
-
-#endif /* TEST_STARTOFCRANKINGPRIMINGPULSE_H_ */