diff --git a/tracetools_test/test/test_intra.py b/tracetools_test/test/test_intra.py
index f90be7d..a3e2a7e 100644
--- a/tracetools_test/test/test_intra.py
+++ b/tracetools_test/test/test_intra.py
@@ -100,9 +100,9 @@ class TestIntra(TraceTestCase):
 
         # Check is_intra_process field value
         start_event_intra = start_events_intra[0]
-        is_intra_value_intra = self.get_field(start_event_intra, 'is_intra_process')
-        self.assertEqual(
-            is_intra_value_intra,
+        self.assertFieldEquals(
+            start_event_intra,
+            'is_intra_process',
             1,
             'is_intra_process field value not valid for intra callback')
 
@@ -116,9 +116,9 @@ class TestIntra(TraceTestCase):
             1,
             'none or more than one normal start event')
         start_event_not_intra = start_events_not_intra[0]
-        is_intra_value_not_intra = self.get_field(start_event_not_intra, 'is_intra_process')
-        self.assertEqual(
-            is_intra_value_not_intra,
+        self.assertFieldEquals(
+            start_event_not_intra,
+            'is_intra_process',
             0,
             'is_intra_process field value not valid for normal callback')
 
diff --git a/tracetools_test/test/test_timer.py b/tracetools_test/test/test_timer.py
index c7ed3bb..067d16f 100644
--- a/tracetools_test/test/test_timer.py
+++ b/tracetools_test/test/test_timer.py
@@ -52,7 +52,7 @@ class TestTimer(TraceTestCase):
         for event in start_events:
             self.assertValidHandle(event, 'callback')
             # Should not be 1 for timer
-            self.assertEqual(
+            self.assertFieldEquals(
                 event,
                 'is_intra_process',
                 0,
@@ -64,7 +64,7 @@ class TestTimer(TraceTestCase):
 
         # Find and check given timer period
         test_timer_init_event = self.get_events_with_procname('test_timer', init_events)
-        self.assertEqual(len(test_timer_init_event), 1)
+        self.assertNumEvents(test_timer_init_event, 1, 'none or more test timer init events')
         test_init_event = test_timer_init_event[0]
         self.assertFieldEquals(test_init_event, 'period', 1000000, 'invalid period')