diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp
index 1f0fe79559..5758137408 100644
--- a/unit_tests/engine_test_helper.cpp
+++ b/unit_tests/engine_test_helper.cpp
@@ -329,7 +329,7 @@ void EngineTestHelper::assertEvent(const char *msg, int index, void *callback, e
 
 	InjectionEvent *actualEvent = (InjectionEvent *)event->action.getArgument();
 
-	assertEqualsLM(msg, (long)expectedEvent->outputs[0], (long)actualEvent->outputs[0]);
+	assertEqualsLM(msg, (uintptr_t)expectedEvent->outputs[0], (uintptr_t)actualEvent->outputs[0]);
 // but this would not work	assertEqualsLM(msg, expectedPair, (long)eventPair);
 }
 
diff --git a/unit_tests/tests/test_signal_executor.cpp b/unit_tests/tests/test_signal_executor.cpp
index 0152c66d8f..828596bc46 100644
--- a/unit_tests/tests/test_signal_executor.cpp
+++ b/unit_tests/tests/test_signal_executor.cpp
@@ -58,10 +58,10 @@ TEST(misc, testSignalExecutor2) {
 
 }
 
-static long prevValue = -1;
+static uintptr_t prevValue = 0;
 
 static void orderCallback(void *a) {
-	long value = (long)a;
+	uintptr_t value = (uintptr_t)a;
 
 	printf("value=%d prevValue=%d\r\n", value, prevValue);
 	ASSERT_TRUE(value > prevValue) << "orderCallback";