diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp
index 0ac210e7e8..a62a9ce011 100644
--- a/unit_tests/engine_test_helper.cpp
+++ b/unit_tests/engine_test_helper.cpp
@@ -86,6 +86,12 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb
 }
 
 EngineTestHelper::~EngineTestHelper() {
+	// Write history to file
+	std::stringstream filePath;
+	filePath << ::testing::UnitTest::GetInstance()->current_test_info()->name() << ".logicdata";
+	writeEvents(filePath.str().c_str());
+
+	// Cleanup
 	Sensor::resetRegistry();
 }
 
diff --git a/unit_tests/engine_test_helper.h b/unit_tests/engine_test_helper.h
index 0e2e1b0c78..9431eb10ac 100644
--- a/unit_tests/engine_test_helper.h
+++ b/unit_tests/engine_test_helper.h
@@ -80,10 +80,11 @@ public:
 	void moveTimeForwardMs(float deltaTimeMs);
 	efitimeus_t getTimeNowUs(void);
 
-	void writeEvents(const char *fileName);
-
 	Engine engine;
 	persistent_config_s persistentConfig;
+
+private:
+	void writeEvents(const char *fileName);
 };
 
 void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injMode = IM_BATCH);
diff --git a/unit_tests/tests/ignition_injection/injection_mode_transition.cpp b/unit_tests/tests/ignition_injection/injection_mode_transition.cpp
index befd2578a9..06a651654d 100644
--- a/unit_tests/tests/ignition_injection/injection_mode_transition.cpp
+++ b/unit_tests/tests/ignition_injection/injection_mode_transition.cpp
@@ -94,6 +94,4 @@ TEST(fuelControl, transitionIssue1592) {
 	// !!!!!!!!! BUG !!!!!!!!!!!!!!!
 
 	EXPECT_EQ(enginePins.injectors[3].getOverlappingCounter(), 0);
-
-	eth.writeEvents("fuel_schedule_transition_issue_1592.logicdata");
 }
diff --git a/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp b/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp
index db280b2ca6..089b81b4f6 100644
--- a/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp
+++ b/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp
@@ -26,7 +26,4 @@ TEST(scheduler, dwellIssue796) {
 	ASSERT_NEAR( 99,  GET_RPM(), EPS3D) << "spinning-RPM#2";
 	// while integer RPM value is 1% away from rpm=100, below oneDegreeUs is much closer to RPM=100 value
 	ASSERT_EQ(300250, (int)(ENGINE(rpmCalculator.oneDegreeUs) * 180));
-
-	eth.writeEvents("dwell_issue_1592.logicdata");
-
 }