diff --git a/test/tests/pbs_Rrecord_resources_used.py b/test/tests/pbs_Rrecord_resources_used.py
index c812cec9fbe..a21f3d87778 100644
--- a/test/tests/pbs_Rrecord_resources_used.py
+++ b/test/tests/pbs_Rrecord_resources_used.py
@@ -134,9 +134,9 @@ def common(self, is_nonrerunnable, restart_mom):
         jid3s1 = subjobs[1]['id']
 
         # Wait for the jobs to start running.
-        self.server.expect(JOB, {ATTR_state: 'R'}, jid1)
-        self.server.expect(JOB, {ATTR_state: 'R'}, jid2)
-        self.server.expect(JOB, {ATTR_state: 'R'}, jid3s1)
+        self.server.expect(JOB, {ATTR_substate: '42'}, jid1)
+        self.server.expect(JOB, {ATTR_substate: '42'}, jid2)
+        self.server.expect(JOB, {ATTR_substate: '42'}, jid3s1)
 
         # Verify that accounting logs have Resource_List.<resource> value
         m = self.server.accounting_match(
@@ -314,9 +314,9 @@ def test_t4(self):
         self.server.manager(MGR_CMD_SET, SERVER, {'scheduling': 'True'},
                             expect=True)
 
-        self.server.expect(JOB, {ATTR_state: 'R'}, jid1)
-        self.server.expect(JOB, {ATTR_state: 'R'}, jid2)
-        self.server.expect(JOB, {ATTR_state: 'R'}, jid3s1)
+        self.server.expect(JOB, {ATTR_substate: '42'}, jid1)
+        self.server.expect(JOB, {ATTR_substate: '42'}, jid2)
+        self.server.expect(JOB, {ATTR_substate: '42'}, jid3s1)
 
         # qrerun the jobs and wait for them to start running.
         self.server.rerunjob(jobid=jid1)
@@ -371,10 +371,10 @@ def test_t5(self):
         jid3s1 = subjobs[1]['id']
 
         # Verify that the jobs have started running.
-        self.server.expect(JOB, {ATTR_state: 'R', 'run_count': 1}, jid1)
-        self.server.expect(JOB, {ATTR_state: 'R', 'run_count': 1}, jid2)
+        self.server.expect(JOB, {ATTR_substate: '42', 'run_count': 1}, jid1)
+        self.server.expect(JOB, {ATTR_substate: '42', 'run_count': 1}, jid2)
         self.server.expect(JOB, {ATTR_state: 'B'}, jid3)
-        self.server.expect(JOB, {ATTR_state: 'R', 'run_count': 1}, jid3s1)
+        self.server.expect(JOB, {ATTR_substate: '42', 'run_count': 1}, jid3s1)
 
         # Verify that the accounting logs have Resource_List.<resource> but no
         # R records.
@@ -475,8 +475,8 @@ def test_t6(self):
         jid2 = self.server.submit(j2)
 
         # Verify that the jobs have started running.
-        self.server.expect(JOB, {ATTR_state: 'R', 'run_count': 1}, jid1)
-        self.server.expect(JOB, {ATTR_state: 'R', 'run_count': 1}, jid2)
+        self.server.expect(JOB, {ATTR_substate: '42', 'run_count': 1}, jid1)
+        self.server.expect(JOB, {ATTR_substate: '42', 'run_count': 1}, jid2)
 
         # Verify that the accounting logs have Resource_List.<resource> but no
         # R records.
@@ -562,10 +562,10 @@ def test_t7(self):
         jid3s1 = subjobs[1]['id']
 
         # Verify that the jobs have started running.
-        self.server.expect(JOB, {ATTR_state: 'R', 'run_count': 1}, jid1)
-        self.server.expect(JOB, {ATTR_state: 'R', 'run_count': 1}, jid2)
+        self.server.expect(JOB, {ATTR_substate: '42', 'run_count': 1}, jid1)
+        self.server.expect(JOB, {ATTR_substate: '42', 'run_count': 1}, jid2)
         self.server.expect(JOB, {ATTR_state: 'B'}, jid3)
-        self.server.expect(JOB, {ATTR_state: 'R', 'run_count': 1}, jid3s1)
+        self.server.expect(JOB, {ATTR_substate: '42', 'run_count': 1}, jid3s1)
 
         # Verify that the accounting logs have Resource_List.<resource> but no
         # R records.