diff --git a/solr/build.xml b/solr/build.xml
index f9ebbdeed8f..1beacb32cf9 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -388,6 +388,10 @@
         </or>
       </not>
     </condition>
+    <condition property="dir.prop" value="-Dsolr.directoryFactory=solr.StandardDirectoryFactory">
+      <isset property="use.fsdir"/>
+    </condition>
+    <property name="dir.prop" value=""/>
     <junit printsummary="no"
            haltonfailure="no"
            errorProperty="tests.failed"
@@ -396,7 +400,9 @@
            >
       <sysproperty key="java.util.logging.config.file" value="${common-solr.dir}/testlogging.properties"/>
       <sysproperty key="tests.luceneMatchVersion" value="${tests.luceneMatchVersion}"/>
+      <jvmarg line="${dir.prop}"/>
       <jvmarg line="${args}"/>
+
       <formatter type="brief" usefile="false" if="junit.details"/>
       <classpath refid="test.run.classpath"/>
       <formatter type="${junit.formatter}"/>
@@ -865,9 +871,14 @@
   </target>
 
   <target name="nightly"
-          depends="test, create-package">
+          depends="set-fsdir, test, create-package">
      <!-- no description, don't advertise -->
   </target>
+  
+  <target name="set-fsdir">
+     <property name="use.fsdir" value="true"/>
+  </target>
+  
   <target name="-taskdef">
     <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
       <classpath>
diff --git a/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java b/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java
index fe510e0dcdd..db672058efa 100644
--- a/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java
+++ b/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java
@@ -105,7 +105,7 @@ public abstract class AbstractSolrTestCase extends TestCase {
     log.info("####SETUP_START " + getName());
     factoryProp = System.getProperty("solr.directoryFactory");
     if (factoryProp == null) {
-      // System.setProperty("solr.directoryFactory","solr.RAMDirectoryFactory");
+      System.setProperty("solr.directoryFactory","solr.RAMDirectoryFactory");
     }
     dataDir = new File(System.getProperty("java.io.tmpdir")
             + System.getProperty("file.separator")
diff --git a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
index 1ae16ad0b8d..91303aaba81 100644
--- a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
+++ b/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
@@ -1,6 +1,7 @@
 package org.apache.solr.handler.component;
 
 import org.apache.solr.BaseDistributedSearchTestCase;
+import org.apache.solr.util.AbstractSolrTestCase;
 
 /**
  * Test for SpellCheckComponent's distributed querying
@@ -11,6 +12,21 @@ import org.apache.solr.BaseDistributedSearchTestCase;
  */
 public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTestCase {
   
+  private String saveProp;
+  @Override
+  public void setUp() throws Exception {
+    // this test requires FSDir
+    saveProp = System.getProperty("solr.directoryFactory");
+    System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
+    super.setUp();
+  }
+  
+  @Override
+  public void tearDown() throws Exception {
+    super.tearDown();
+    System.setProperty("solr.directoryFactory", saveProp);
+  }
+  
   @Override
   public void doTest() throws Exception {
     index(id, "1", "lowerfilt", "toyota");
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml b/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
index 69f1721fad9..643814336e2 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
@@ -31,6 +31,11 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
index 195c811f11c..dc134682e11 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
@@ -31,6 +31,12 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
index 099fdb4804a..f69d7a16136 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
@@ -31,6 +31,12 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml b/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
index f88485ab57b..a11a372d95b 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
@@ -29,6 +29,12 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml b/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
index bdb479f1ae9..4025ebd9df9 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
@@ -31,6 +31,12 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml b/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
index 419d999c89b..a8dc6e47aff 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
@@ -26,6 +26,12 @@
 
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
     <useCompoundFile>false</useCompoundFile>
     <mergeFactor>10</mergeFactor>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml b/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
index f26d5175189..65a09251acb 100755
--- a/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
@@ -31,6 +31,12 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml b/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
index 9950434dc8e..84a4b3bd4de 100755
--- a/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
@@ -31,6 +31,12 @@
   <indexDir>index</indexDir>
   -->
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml b/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
index 65582e98415..0ac15041690 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
@@ -29,6 +29,12 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml b/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
index 5f21a64973f..15b7abce8a3 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
@@ -45,6 +45,12 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml b/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
index f7538e59f62..78a6e180639 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
@@ -31,6 +31,12 @@
   <indexDir>index</indexDir>
   -->
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml b/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
index 1b0b3b08ac9..cd470e9e6d4 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
@@ -45,6 +45,12 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml b/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
index 36a34fcfd20..739caf0a098 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
@@ -45,6 +45,11 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml b/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
index 449d5dbedf3..918783158c6 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
@@ -23,6 +23,10 @@
   -->
 
 <config>
+    <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
   
   
   <query>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml b/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
index 6d12fcd6418..4308cf6af4a 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
@@ -26,6 +26,12 @@
 
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
     <useCompoundFile>false</useCompoundFile>
     <mergeFactor>10</mergeFactor>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml b/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
index dc834a3fe77..64e0542cd4a 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
@@ -17,6 +17,12 @@
 -->
 
 <config>
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
   <indexDefaults>
     <useCompoundFile>false</useCompoundFile>
     <mergeFactor>10</mergeFactor>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml b/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
index 4edc63c68ae..3d6e262cc83 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
@@ -37,6 +37,11 @@
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
    unless overridden. -->
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml b/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
index 5b7d97fc619..5dbbed94e67 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
@@ -19,6 +19,12 @@
 
 <config>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
 <updateRequestProcessorChain name="standard">
   <processor class="solr.LogUpdateProcessorFactory" >
    <int name="maxNumToLog">100</int>
diff --git a/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml b/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
index 8b45f8f9e66..9eceab27afc 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
@@ -30,6 +30,12 @@
        It defaults to "index" if not present, and should probably
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
+  
+    <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  
 
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default
diff --git a/solr/src/test/test-files/solr/conf/solrconfig.xml b/solr/src/test/test-files/solr/conf/solrconfig.xml
index 466504581ea..802f10fd65d 100644
--- a/solr/src/test/test-files/solr/conf/solrconfig.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig.xml
@@ -48,7 +48,7 @@
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
-  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
 
   <luceneMatchVersion>3.1</luceneMatchVersion>
 
diff --git a/solr/src/test/test-files/solr/conf/solrconfig_perf.xml b/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
index 02a19e785ae..a3d94cb6973 100755
--- a/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
@@ -31,6 +31,11 @@
        If replication is in use, this should match the replication configuration. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
 
   <indexDefaults>
    <!-- Values here affect all index writers and act as a default unless overridden. -->