diff --git a/calico_node/tests/st/bgp/test_ipip.py b/calico_node/tests/st/bgp/test_ipip.py
index 3e5b5658cbc..c9b02080c18 100644
--- a/calico_node/tests/st/bgp/test_ipip.py
+++ b/calico_node/tests/st/bgp/test_ipip.py
@@ -138,6 +138,7 @@ def test_ipip(self, backend):
             self.modify_subnet(host2, 32)
             self.assert_ipip_routing(host1, workload_host1, workload_host2,
                                      True)
+    test_ipip.batchnumber = 4
 
     def test_ipip_addr_assigned(self):
         with DockerHost('host', dind=False, start_calico=False) as host:
@@ -169,6 +170,7 @@ def test_ipip_addr_assigned(self):
             self.pool_action(host, "create", new_ipv4_pool, True)
             self.pool_action(host, "delete", ipv4_pool, True)
             self.assert_tunl_ip(host, new_ipv4_pool)
+    test_ipip_addr_assigned.batchnumber = 4
 
     @parameterized.expand([
         ('bird',),
@@ -232,7 +234,7 @@ def test_issue_1584(self, backend):
                 # on the current IPIP mode (only a mode of Always will use the tunnel).
                 host1.execute("docker rm -f calico-node")
                 self.assert_ipip_routing(host1, workload_host1, workload_host2,
-                                         modes[-1] == "Always")
+                                         modes[-1] == "always")
 
                 # Update the IPIP mode.
                 self.pool_action(host1, "replace", DEFAULT_IPV4_POOL_CIDR, mode is not None, ipip_mode=mode)
@@ -250,7 +252,8 @@ def test_issue_1584(self, backend):
                 # on host1 fixes the route.
                 host1.start_calico_node("--ip=autodetect --backend={0}".format(backend))
                 self.assert_ipip_routing(host1, workload_host1, workload_host2,
-                                         modes[-1] == "Always")
+                                         modes[-1] == "lways")
+    test_issue_1584.batchnumber = 4
 
     def pool_action(self, host, action, cidr, ipip, disabled=False, ipip_mode="", calicoctl_version=None):
         """