diff --git a/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java b/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java
index d2d7b3526..c86835295 100644
--- a/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java
@@ -185,9 +185,6 @@ public class TerrainFractalGridTest extends SimpleApplication {
 //                        Logger.getLogger(TerrainFractalGridTest.class.getName()).log(Level.SEVERE, null, ex);
 //                    }
                     //workaround for bugged test j3o's
-                    while(quad.getControl(RigidBodyControl.class)!=null){
-                        quad.removeControl(RigidBodyControl.class);
-                    }
                     quad.addControl(new RigidBodyControl(new HeightfieldCollisionShape(quad.getHeightMap(), terrain.getLocalScale()), 0));
                     bulletAppState.getPhysicsSpace().add(quad);
                 }
diff --git a/engine/src/test/jme3test/terrain/TerrainQuadGridTest.java b/engine/src/test/jme3test/terrain/TerrainQuadGridTest.java
index 84c889bb1..4e51c93ff 100644
--- a/engine/src/test/jme3test/terrain/TerrainQuadGridTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainQuadGridTest.java
@@ -144,6 +144,9 @@ public class TerrainQuadGridTest extends SimpleApplication {
                 }
 
                 public void tileAttached(Vector3f cell, TerrainQuad quad) {
+                    while(quad.getControl(RigidBodyControl.class)!=null){
+                        quad.removeControl(RigidBodyControl.class);
+                    }
                     quad.addControl(new RigidBodyControl(new HeightfieldCollisionShape(quad.getHeightMap(), terrain.getLocalScale()), 0));
                     bulletAppState.getPhysicsSpace().add(quad);
                 }