diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/BatchUpgradeTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/BatchUpgradeTest.java
index 3eb72f3add..7ba12ff598 100644
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/BatchUpgradeTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/BatchUpgradeTest.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.upgrade;
 
 import org.junit.Test;
 
+import org.apache.cassandra.Util;
 import org.apache.cassandra.distributed.api.ConsistencyLevel;
 
 import static org.junit.Assert.assertEquals;
@@ -31,26 +32,24 @@ public class BatchUpgradeTest extends UpgradeTestBase
     {
         new TestCase()
         .nodes(2)
-
         .nodesToUpgrade(2)
         .upgradesToCurrentFrom(v40).setup((cluster) -> {
-            cluster.schemaChange("CREATE TABLE "+KEYSPACE+".users (" +
+            cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".users (" +
                                  "userid uuid PRIMARY KEY," +
                                  "firstname ascii," +
                                  "lastname ascii," +
                                  "age int) WITH COMPACT STORAGE");
         }).runAfterNodeUpgrade((cluster, node) -> {
             cluster.coordinator(2).execute("BEGIN BATCH\n" +
-                                           "    UPDATE "+KEYSPACE+".users SET age = 37 WHERE userid = f47ac10b-58cc-4372-a567-0e02b2c3d479\n" +
-                                           "    DELETE firstname, lastname FROM "+KEYSPACE+".users WHERE userid = 550e8400-e29b-41d4-a716-446655440000\n" +
+                                           "    UPDATE " + KEYSPACE + ".users SET age = 37 WHERE userid = f47ac10b-58cc-4372-a567-0e02b2c3d479\n" +
+                                           "    DELETE firstname, lastname FROM " + KEYSPACE + ".users WHERE userid = 550e8400-e29b-41d4-a716-446655440000\n" +
                                            "APPLY BATCH", ConsistencyLevel.ALL);
         }).runAfterClusterUpgrade((cluster) -> {
-            assertEquals(0, cluster.get(1).executeInternal("select * from system.batches").length);
-            assertEquals(0, cluster.get(2).executeInternal("select * from system.batches").length);
+            Util.spinAssertEquals(0, () -> cluster.get(1).executeInternal("select * from system.batches").length, 10);
+            Util.spinAssertEquals(0, () -> cluster.get(2).executeInternal("select * from system.batches").length, 10);
             assertEquals(0, cluster.get(1).logs().grep("ClassCastException").getResult().size());
             assertEquals(0, cluster.get(2).logs().grep("ClassCastException").getResult().size());
         })
         .run();
-
     }
 }