diff --git a/test/cmp_entity/test_cmp_entity.c b/test/cmp_entity/test_cmp_entity.c
index 89c3534547421e60d3f0677371cd2eeb8c4970a3..2c1274d0082b34a88138d06e5b4763cf23abaaaf 100644
--- a/test/cmp_entity/test_cmp_entity.c
+++ b/test/cmp_entity/test_cmp_entity.c
@@ -213,7 +213,7 @@ void test_ent_start_timestamp(void)
 	TEST_ASSERT_FALSE(error);
 
 	start_timestamp_read = cmp_ent_get_start_timestamp(&ent);
-	TEST_ASSERT_EQUAL_UINT64(start_timestamp, start_timestamp_read);
+	TEST_ASSERT_EQUAL(start_timestamp, start_timestamp_read);
 
 	/* check the right position in the header */
 	TEST_ASSERT_EQUAL_HEX(0x12, entity_p[10]);
@@ -224,9 +224,9 @@ void test_ent_start_timestamp(void)
 	TEST_ASSERT_EQUAL_HEX(0xBC, entity_p[15]);
 
 	coarse_start_timestamp_read = cmp_ent_get_coarse_start_time(&ent);
-	TEST_ASSERT_EQUAL_UINT64(0x12345678, coarse_start_timestamp_read);
+	TEST_ASSERT_EQUAL(0x12345678, coarse_start_timestamp_read);
 	fine_start_timestamp_read = cmp_ent_get_fine_start_time(&ent);
-	TEST_ASSERT_EQUAL_UINT64(0x9ABC, fine_start_timestamp_read);
+	TEST_ASSERT_EQUAL(0x9ABC, fine_start_timestamp_read);
 
 	/* error cases */
 	start_timestamp = 0x1000000000000ULL;
@@ -325,7 +325,7 @@ void test_ent_end_timestamp(void)
 	TEST_ASSERT_FALSE(error);
 
 	end_timestamp_read = cmp_ent_get_end_timestamp(&ent);
-	TEST_ASSERT_EQUAL_HEX64(end_timestamp, end_timestamp_read);
+	TEST_ASSERT_EQUAL(end_timestamp, end_timestamp_read);
 
 	/* check the right position in the header */
 	TEST_ASSERT_EQUAL_HEX(0x12, entity_p[16]);
@@ -336,9 +336,9 @@ void test_ent_end_timestamp(void)
 	TEST_ASSERT_EQUAL_HEX(0xBC, entity_p[21]);
 
 	coarse_end_timestamp_read = cmp_ent_get_coarse_end_time(&ent);
-	TEST_ASSERT_EQUAL_UINT64(0x12345678, coarse_end_timestamp_read);
+	TEST_ASSERT_EQUAL(0x12345678, coarse_end_timestamp_read);
 	fine_end_timestamp_read = cmp_ent_get_fine_end_time(&ent);
-	TEST_ASSERT_EQUAL_UINT64(0x9ABC, fine_end_timestamp_read);
+	TEST_ASSERT_EQUAL(0x9ABC, fine_end_timestamp_read);
 
 	/* error cases */
 	end_timestamp = 0x1000000000000ULL;
@@ -1950,7 +1950,7 @@ void test_cmp_ent_create_timestamp(void)
 	ts.tv_nsec = 0;
 	timestamp1 = cmp_ent_create_timestamp(&ts);
 	ts.tv_sec = EPOCH + 1;
-	ts.tv_nsec = 15258;
+	ts.tv_nsec = 15259;
 	timestamp2 = cmp_ent_create_timestamp(&ts);
 	TEST_ASSERT_EQUAL_HEX(0x10001, timestamp2-timestamp1);