diff --git a/README.txt b/README.txt
index 9864308..4d761b1 100644
--- a/README.txt
+++ b/README.txt
@@ -46,24 +46,37 @@ server crash or power loss (LUCENE-3418) and have bugs that interfere
 with the Drupal admin reports. Solr 3.4 has a problem with
 SortMissingLast so Solr 3.5.0 or later is strongly preferred.
 
-Unpack the tarball somewhere not visible to the web (not in your webserver
-docroot and not inside of your Drupal directory).
+Unpack the Solr tarball somewhere not visible to the web (not in your
+webserver docroot and not inside of your Drupal directory).
 
 The Solr download comes with an example application that you can use for
 testing, development, and even for smaller production sites. This
 application is found at apache-solr-1.4.1/example.
 
+You must use 3 Solr configuration files that come with the Drupal
+module or the integration will not work correctly.
+
+For Solr 1.4 use the ones found in:
+solr-conf/solr-1.4/
+
+for Solr 3.5.0 or 3.6.1 use:
+solr-conf/solr-3.x/
+
+While the Solr 1.4 files will work for Solr 3.5+, they are not optimal
+and you will be missing important new features.
+
+For example, when deploying solr 1.4:
+
 Move apache-solr-1.4.1/example/solr/conf/schema.xml and rename it to
-something like schema.bak. Then move the solr-conf/schema.xml that
-comes with this Drupal module to take its place. If you are using
-Solr 3.5 or later, you can use solr-conf/schema-solr3x.xml instead.
+something like schema.bak. Then move the solr-conf/solr-1.4/schema.xml
+that comes with this Drupal module to take its place.
 
 Similarly, move apache-solr-1.4.1/example/solr/conf/solrconfig.xml and rename
-it like solrconfig.bak. Then move the solr-conf/solrconfig.xml that comes
-with this module to take its place.
+it like solrconfig.bak. Then move the solr-conf/solr-1.4/solrconfig.xml
+that comes with this module to take its place.
 
-Finally, move apache-solr-1.4.1/example/solr/conf/protwords.txt and rename
-it like protwords.bak. Then move the solr-conf/protwords.txt that comes
+Finally, move apache-solr-1.4.1/example/solr/conf/protwords.txt and rename it
+protwords.bak. Then move the solr-conf/solr-1.4/protwords.txt that comes
 with this module to take its place.
 
 Make sure that the conf directory includes the following files - the Solr core
diff --git a/solr-conf/solr-1.4/schema.xml b/solr-conf/solr-1.4/schema.xml
index 5405aed..133b118 100644
--- a/solr-conf/solr-1.4/schema.xml
+++ b/solr-conf/solr-1.4/schema.xml
@@ -10,7 +10,7 @@
  http://wiki.apache.org/solr/SchemaXml
 -->
 
-<schema name="drupal-3.0" version="1.2">
+<schema name="drupal-3.0-0-solr1.4" version="1.2">
     <!-- attribute "name" is the name of this schema and is only used for display purposes.
          Applications should change this to reflect the nature of the search collection.
          version="1.2" is Solr's version number for the schema syntax and semantics.  It should
diff --git a/solr-conf/solr-1.4/solrconfig.xml b/solr-conf/solr-1.4/solrconfig.xml
index 3de4a6f..a0818cd 100644
--- a/solr-conf/solr-1.4/solrconfig.xml
+++ b/solr-conf/solr-1.4/solrconfig.xml
@@ -16,7 +16,7 @@
  limitations under the License.
 -->
 
-<config name="drupal-3.0">
+<config name="drupal-3.0-0-solr1.4">
   <!-- Set this to 'false' if you want solr to continue working after it has
        encountered an severe configuration error.  In a production environment,
        you may want solr to keep working even if one handler is mis-configured.
diff --git a/solr-conf/solr-3.x/schema.xml b/solr-conf/solr-3.x/schema.xml
index 8fbd6a9..2cebb36 100644
--- a/solr-conf/solr-3.x/schema.xml
+++ b/solr-conf/solr-3.x/schema.xml
@@ -10,7 +10,7 @@
  http://wiki.apache.org/solr/SchemaXml
 -->
 
-<schema name="drupal-3.0-solr3" version="1.3">
+<schema name="drupal-3.0-0-solr3" version="1.3">
     <!-- attribute "name" is the name of this schema and is only used for display purposes.
          Applications should change this to reflect the nature of the search collection.
          version="1.2" is Solr's version number for the schema syntax and semantics.  It should
diff --git a/solr-conf/solr-3.x/solrconfig.xml b/solr-conf/solr-3.x/solrconfig.xml
index bd82571..ade4fcd 100644
--- a/solr-conf/solr-3.x/solrconfig.xml
+++ b/solr-conf/solr-3.x/solrconfig.xml
@@ -16,7 +16,7 @@
  limitations under the License.
 -->
 
-<config name="drupal-3.0-solr3">
+<config name="drupal-3.0-0-solr3">
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
diff --git a/tests/solr_index_and_search.test b/tests/solr_index_and_search.test
index 49847fd..e449ef5 100755
--- a/tests/solr_index_and_search.test
+++ b/tests/solr_index_and_search.test
@@ -130,7 +130,8 @@ class DrupalSolrOnlineWebTestCase extends AbstractDrupalSolrOnlineWebTestCase {
   function setUp() {
     parent::setUp();
     parent::setUpSolr(
-      dirname(__FILE__) . '/../solr-conf/*',
+      // The Solr 1.4 conf will work in both 1.4 and 3.5.
+      dirname(__FILE__) . '/../solr-conf/solr-1.4/*',
       dirname(__FILE__) . '/conf/*'
     );
   }