diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index 7d1ed84e1b3..5cfceafa220 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -75,7 +75,6 @@ import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.discovery.zen.elect.ElectMasterService;
 import org.elasticsearch.index.codec.CodecService;
 import org.elasticsearch.index.fielddata.FieldDataType;
-import org.elasticsearch.index.fielddata.IndexFieldDataService;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.FieldMapper.Loading;
@@ -477,12 +476,14 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
             builder.put(IndicesQueryCache.INDEX_CACHE_QUERY_ENABLED, random.nextBoolean());
         }
 
-        if (random.nextBoolean()) {
+        // Disabled for now as it seems to make tests unstable
+        // TODO: figure out what is wrong with the soft and/or resident caches?
+        /*if (random.nextBoolean()) {
             builder.put(IndexFieldDataService.FIELDDATA_CACHE_KEY, randomFrom(
                     IndexFieldDataService.FIELDDATA_CACHE_VALUE_NODE,
                     IndexFieldDataService.FIELDDATA_CACHE_VALUE_RESIDENT,
                     IndexFieldDataService.FIELDDATA_CACHE_VALUE_SOFT));
-        }
+        }*/
         
         return builder;
     }