diff --git a/src/test/java/io/redis/examples/HomeJsonExample.java b/src/test/java/io/redis/examples/HomeJsonExample.java
index c9124b2fc2..36265229a0 100644
--- a/src/test/java/io/redis/examples/HomeJsonExample.java
+++ b/src/test/java/io/redis/examples/HomeJsonExample.java
@@ -1,4 +1,5 @@
 // EXAMPLE: java_home_json
+// BINDER_ID jedis-java_home_json
 // REMOVE_START
 package io.redis.examples;
 
@@ -20,22 +21,10 @@
 import java.util.Map;
 // STEP_END
 
-// HIDE_START
 public class HomeJsonExample {
 
     @Test
     public void run() {
-// HIDE_END
-        // STEP_START connect
-        UnifiedJedis jedis = new UnifiedJedis("redis://localhost:6379");
-        // STEP_END
-
-        //REMOVE_START
-        // Clear the indexes and keys here before using them in tests.
-        try {jedis.ftDropIndex("idx:users");} catch (JedisDataException j){}
-        try {jedis.ftDropIndex("hash-idx:users");} catch (JedisDataException j){}
-        jedis.del("user:1", "user:2", "user:3", "huser:1", "huser:2", "huser:3");
-        //REMOVE_END
 
         // STEP_START create_data
         JSONObject user1 = new JSONObject()
@@ -57,6 +46,15 @@ public void run() {
                 .put("city", "Tel Aviv");
         // STEP_END
 
+        // STEP_START connect
+        UnifiedJedis jedis = new UnifiedJedis("redis://localhost:6379");
+        // STEP_END
+
+        // STEP_START cleanup_json
+        try {jedis.ftDropIndex("idx:users");} catch (JedisDataException j){}
+        jedis.del("user:1", "user:2", "user:3");
+        // STEP_END
+
         // STEP_START make_index
         SchemaField[] schema = {
             TextField.of("$.name").as("name"),
@@ -151,6 +149,11 @@ public void run() {
                     .sorted().toArray());
         // REMOVE_END
 
+        // STEP_START cleanup_hash
+        try {jedis.ftDropIndex("hash-idx:users");} catch (JedisDataException j){}
+        jedis.del("huser:1", "huser:2", "huser:3");
+        // STEP_END
+
         // STEP_START make_hash_index
         SchemaField[] hashSchema = {
             TextField.of("name"),
@@ -223,9 +226,9 @@ public void run() {
         assertEquals("huser:3", paulHashDocs.get(0).getId());
         // REMOVE_END
 
-// HIDE_START
+        // STEP_START close
         jedis.close();
+        // STEP_END
     }
 }
-// HIDE_END