diff --git a/src/test/java/com/basho/riak/client/api/commands/indexes/itest/ITestFullBucketRead.java b/src/test/java/com/basho/riak/client/api/commands/indexes/itest/ITestFullBucketRead.java
index 91ce2bf80..df7a53d7b 100644
--- a/src/test/java/com/basho/riak/client/api/commands/indexes/itest/ITestFullBucketRead.java
+++ b/src/test/java/com/basho/riak/client/api/commands/indexes/itest/ITestFullBucketRead.java
@@ -42,9 +42,17 @@ public static void BeforeClass() throws ExecutionException, InterruptedException
     {
         Assume.assumeTrue(testTimeSeries);
         Assume.assumeTrue(testCoveragePlan);
+
+        bucketName = BinaryValue.create("ITestFullBucketRead" + new Random().nextLong());
         setupData();
     }
 
+    @AfterClass
+    public static void AfterClass() throws ExecutionException, InterruptedException
+    {
+        resetAndEmptyBucket(defaultNamespace());
+    }
+
     private static void setupData() throws ExecutionException, InterruptedException
     {
         String indexName = "creationNo";
@@ -84,16 +92,6 @@ private static void setupCoveragePlan() throws ExecutionException, InterruptedEx
         }
     }
 
-    @AfterClass
-    public static void cleanupData() throws ExecutionException, InterruptedException
-    {
-        resetAndEmptyBucket(bucketName);
-        if (testBucketType)
-        {
-            resetAndEmptyBucket(defaultNamespace());
-        }
-    }
-
     @Test
     public void readPlainTextValues() throws ExecutionException, InterruptedException, UnknownHostException
     {