diff --git a/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java b/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java
index dcea80e25..d2d7b3526 100644
--- a/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java
@@ -184,6 +184,10 @@ public class TerrainFractalGridTest extends SimpleApplication {
 //                    } catch (IOException ex) {
 //                        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/TerrainQuadGridSerializationTest.java b/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java
index b4e719721..268fb6ed5 100644
--- a/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java
@@ -82,6 +82,10 @@ public class TerrainQuadGridSerializationTest extends SimpleApplication {
                 }
 
                 public void tileAttached(Vector3f cell, TerrainQuad quad) {
+                    //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);
                 }