diff --git a/unit_tests/.gitignore b/unit_tests/.gitignore
index 0a3cc63984..e53bb9e0cb 100644
--- a/unit_tests/.gitignore
+++ b/unit_tests/.gitignore
@@ -2,4 +2,4 @@
 build*/
 gcov_working_area
 triggers
-*.logicdata
+unittest_*.logicdata
diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp
index 9971e43d21..292fd73204 100644
--- a/unit_tests/engine_test_helper.cpp
+++ b/unit_tests/engine_test_helper.cpp
@@ -114,7 +114,7 @@ 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";
+	filePath << "unittest_" << ::testing::UnitTest::GetInstance()->current_test_info()->name() << ".logicdata";
 	writeEvents(filePath.str().c_str());
 
 	// Cleanup