diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
index 7debc649041c..b4a3ce422625 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
@@ -101,18 +101,23 @@ public static ManagedModelStore getNewManagedModelStore() {
         .getManagedResource(CommonLTRParams.MODEL_STORE_END_POINT);
     return fs;
   }
-
-  public static void setuptest(String solrconfig, String schema)
-      throws Exception {
-    initCore(solrconfig, schema);
-
+  
+  protected static SortedMap<ServletHolder,String>  setupTestInit(
+      String solrconfig, String schema,
+      boolean isPersistent) throws Exception {
     tmpSolrHome = createTempDir().toFile();
     tmpConfDir = new File(tmpSolrHome, CONF_DIR);
     tmpConfDir.deleteOnExit();
     FileUtils.copyDirectory(new File(TEST_HOME()),
         tmpSolrHome.getAbsoluteFile());
+    
     final File fstore = new File(tmpConfDir, FEATURE_FILE_NAME);
     final File mstore = new File(tmpConfDir, MODEL_FILE_NAME);
+    
+    if (isPersistent) {
+      fstorefile = fstore;
+      mstorefile = mstore;
+    }
 
     if (fstore.exists()) {
       log.info("remove feature store config file in {}",
@@ -147,6 +152,18 @@ public static void setuptest(String solrconfig, String schema)
     extraServlets.put(solrRestApi, PARENT_ENDPOINT);
 
     System.setProperty("managed.schema.mutable", "true");
+    
+    return extraServlets;
+  }
+
+  public static void setuptest(String solrconfig, String schema)
+      throws Exception {
+    initCore(solrconfig, schema);
+
+    File mstore = null;
+    File fstore = null;
+    SortedMap<ServletHolder,String> extraServlets = 
+        setupTestInit(solrconfig,schema,false);
     System.setProperty("enable.update.log", "false");
 
     createJettyAndHarness(tmpSolrHome.getAbsolutePath(), solrconfig, schema,
@@ -157,42 +174,9 @@ public static void setupPersistentTest(String solrconfig, String schema)
       throws Exception {
     initCore(solrconfig, schema);
 
-    tmpSolrHome = createTempDir().toFile();
-    tmpConfDir = new File(tmpSolrHome, CONF_DIR);
-    tmpConfDir.deleteOnExit();
-    FileUtils.copyDirectory(new File(TEST_HOME()),
-        tmpSolrHome.getAbsoluteFile());
-    fstorefile = new File(tmpConfDir, FEATURE_FILE_NAME);
-    mstorefile = new File(tmpConfDir, MODEL_FILE_NAME);
-
-    if (fstorefile.exists()) {
-      log.info("remove feature store config file in {}",
-          fstorefile.getAbsolutePath());
-      Files.delete(fstorefile.toPath());
-    }
-    if (mstorefile.exists()) {
-      log.info("remove model store config file in {}",
-          mstorefile.getAbsolutePath());
-      Files.delete(mstorefile.toPath());
-    }
-    // clearModelStore();
-
-    final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
-    final ServletHolder solrRestApi = new ServletHolder("SolrSchemaRestApi",
-        ServerServlet.class);
-    solrRestApi.setInitParameter("org.restlet.application",
-        "org.apache.solr.rest.SolrSchemaRestApi");
-    solrRestApi.setInitParameter("storageIO",
-        "org.apache.solr.rest.ManagedResourceStorage$JsonStorageIO");
-
-    extraServlets.put(solrRestApi, PARENT_ENDPOINT); // '/schema/*' matches
-    // '/schema',
-    // '/schema/', and
-    // '/schema/whatever...'
-
-    System.setProperty("managed.schema.mutable", "true");
-    // System.setProperty("enable.update.log", "false");
-
+    SortedMap<ServletHolder,String> extraServlets = 
+        setupTestInit(solrconfig,schema,true);
+    
     createJettyAndHarness(tmpSolrHome.getAbsolutePath(), solrconfig, schema,
         "/solr", true, extraServlets);
   }
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestSolrCloud.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestSolrCloud.java
new file mode 100644
index 000000000000..0b7e65807ef8
--- /dev/null
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestSolrCloud.java
@@ -0,0 +1,238 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.ltr.ranking;
+
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+import java.nio.file.Files;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.embedded.JettyConfig;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.response.CollectionAdminResponse;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.cloud.AbstractDistribZkTestBase;
+import org.apache.solr.cloud.MiniSolrCloudCluster;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.ltr.TestRerankBase;
+import org.apache.solr.ltr.feature.impl.SolrFeature;
+import org.apache.solr.ltr.feature.impl.ValueFeature;
+import org.apache.solr.ltr.util.CommonLTRParams;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.restlet.ext.servlet.ServerServlet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestSolrCloud extends TestRerankBase {
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  private MiniSolrCloudCluster solrCluster;
+  
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+
+    String solrconfig = "solrconfig-ltr.xml";
+    String schema = "schema-ltr.xml";
+    
+    SortedMap<ServletHolder,String> extraServlets = 
+        setupTestInit(solrconfig,schema,true);
+    System.setProperty("enable.update.log", "true");
+    
+    
+    JettyConfig jc = buildJettyConfig("/solr");
+    jc = JettyConfig.builder(jc).withServlets(extraServlets).build();
+    solrCluster = new MiniSolrCloudCluster(3, tmpSolrHome.toPath(), jc);
+    File configDir = tmpSolrHome.toPath().resolve("collection1/conf").toFile();
+    solrCluster.uploadConfigDir(configDir, "conf1");
+
+    solrCluster.getSolrClient().setDefaultCollection(COLLECTION);
+    createTestCollection(COLLECTION);
+    createJettyAndHarness(tmpSolrHome.getAbsolutePath(), solrconfig, schema,
+        "/solr", true, extraServlets);
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+    restTestHarness.close();
+    restTestHarness = null;
+    jetty.stop();
+    jetty = null;
+    solrCluster.shutdown();
+    super.tearDown();
+  }
+  
+  @Test
+  public void testSimpleQuery() throws Exception {
+    
+    //add models and features
+    String featureJson1 = getFeatureInJson(
+        "powpularityS", SolrFeature.class.getCanonicalName(),
+        "test","{\"q\":\"{!func}pow(popularity,2)\"}");
+    assertJPut(CommonLTRParams.FEATURE_STORE_END_POINT, featureJson1,
+        "/responseHeader/status==0");
+    String featureJson2 = getFeatureInJson(
+        "c3", ValueFeature.class.getCanonicalName(), 
+        "test", "{\"value\":2}");
+    assertJPut(CommonLTRParams.FEATURE_STORE_END_POINT, featureJson2,
+        "/responseHeader/status==0");
+    
+    
+    String modelJson = getModelInJson(
+        "powpularityS-model", RankSVMModel.class.getCanonicalName(),
+        new String[] {"powpularityS","c3"}, "test", 
+        "{\"weights\":{\"powpularityS\":1.0,\"c3\":1.0}}");
+    assertJPut(CommonLTRParams.MODEL_STORE_END_POINT, modelJson,
+        "/responseHeader/status==0");
+    
+    
+    reloadCollection(COLLECTION);
+
+    //Test regular query
+    SolrQuery query = new SolrQuery("{!func}pow(popularity,-1)");
+    query.setRequestHandler("/query");
+    query.setFields("*,score");
+    query.setParam("rows", "4");
+    
+    QueryResponse queryResponse = 
+        solrCluster.getSolrClient().query(COLLECTION,query);
+    assertEquals(8, queryResponse.getResults().getNumFound());
+    assertEquals("1", queryResponse.getResults().get(0).get("id").toString());
+    assertEquals("2", queryResponse.getResults().get(1).get("id").toString());
+    assertEquals("3", queryResponse.getResults().get(2).get("id").toString());
+    assertEquals("4", queryResponse.getResults().get(3).get("id").toString());
+    
+    //Test re-rank and feature vectors returned
+    query.setFields("*,score,features:[fv]");
+    query.add("rq", "{!ltr model=powpularityS-model reRankDocs=4}");
+    queryResponse = 
+        solrCluster.getSolrClient().query(COLLECTION,query);
+    assertEquals(8, queryResponse.getResults().getNumFound());
+    assertEquals("4", queryResponse.getResults().get(0).get("id").toString());
+    assertEquals("powpularityS:16.0;c3:2.0", 
+        queryResponse.getResults().get(0).get("features").toString());
+    assertEquals("3", queryResponse.getResults().get(1).get("id").toString());
+    assertEquals("powpularityS:9.0;c3:2.0", 
+        queryResponse.getResults().get(1).get("features").toString());
+    assertEquals("2", queryResponse.getResults().get(2).get("id").toString());
+    assertEquals("powpularityS:4.0;c3:2.0", 
+        queryResponse.getResults().get(2).get("features").toString());
+    assertEquals("1", queryResponse.getResults().get(3).get("id").toString());
+    assertEquals("powpularityS:1.0;c3:2.0", 
+        queryResponse.getResults().get(3).get("features").toString());
+  }
+
+  private void createCollection(String name, String config) throws Exception {
+    CollectionAdminResponse response;
+    CollectionAdminRequest.Create create = new CollectionAdminRequest.Create();
+    create.setConfigName(config);
+    create.setCollectionName(name);
+    create.setNumShards(1);
+    create.setReplicationFactor(1);
+    create.setMaxShardsPerNode(1);
+    response = create.process(solrCluster.getSolrClient());
+
+    if (response.getStatus() != 0 || response.getErrorMessages() != null) {
+      fail("Could not create collection. Response" + response.toString());
+    }
+    ZkStateReader zkStateReader = solrCluster.getSolrClient().getZkStateReader();
+    AbstractDistribZkTestBase.waitForRecoveriesToFinish(name, zkStateReader, false, true, 100);
+  }
+
+  private void createTestCollection(String collection) throws Exception {
+    createCollection(collection, "conf1");
+    
+    SolrInputDocument doc = new SolrInputDocument();
+    doc.setField("id", "1");
+    doc.setField("title", "a1");
+    doc.setField("description", "bloom");
+    doc.setField("popularity", 1);
+    solrCluster.getSolrClient().add(collection, doc);
+
+    doc = new SolrInputDocument();
+    doc.setField("id", "2");
+    doc.setField("title", "a1");
+    doc.setField("description", "bloom");
+    doc.setField("popularity", 2);
+    solrCluster.getSolrClient().add(collection, doc);
+
+    doc = new SolrInputDocument();
+    doc.setField("id", "3");
+    doc.setField("title", "a1");
+    doc.setField("description", "bloom");
+    doc.setField("popularity", 3);
+    solrCluster.getSolrClient().add(collection, doc);
+
+    doc = new SolrInputDocument();
+    doc.setField("id", "4");
+    doc.setField("title", "a1");
+    doc.setField("description", "bloom");
+    doc.setField("popularity", 4);
+    solrCluster.getSolrClient().add(collection, doc);
+
+    doc = new SolrInputDocument();
+    doc.setField("id", "5");
+    doc.setField("title", "a1");
+    doc.setField("description", "bloom");
+    doc.setField("popularity", 5);
+    solrCluster.getSolrClient().add(collection, doc);
+
+    doc = new SolrInputDocument();
+    doc.setField("id", "6");
+    doc.setField("title", "a1");
+    doc.setField("description", "bloom");
+    doc.setField("popularity", 6);
+    solrCluster.getSolrClient().add(collection, doc);
+
+    doc = new SolrInputDocument();
+    doc.setField("id", "7");
+    doc.setField("title", "a1");
+    doc.setField("description", "bloom");
+    doc.setField("popularity", 7);
+    solrCluster.getSolrClient().add(collection, doc);
+
+    doc = new SolrInputDocument();
+    doc.setField("id", "8");
+    doc.setField("title", "a1");
+    doc.setField("description", "bloom");
+    doc.setField("popularity", 8);
+    solrCluster.getSolrClient().add(collection, doc);
+    
+    solrCluster.getSolrClient().commit(collection);
+  }
+  
+  private void reloadCollection(String collection) throws Exception {
+    CollectionAdminRequest.Reload reloadRequest = CollectionAdminRequest.reloadCollection(collection);
+    CollectionAdminResponse response = reloadRequest.process(solrCluster.getSolrClient());
+    assertEquals(0, response.getStatus());
+    assertTrue(response.isSuccess());
+  }
+  
+  @AfterClass
+  public static void after() throws Exception {
+    FileUtils.deleteDirectory(tmpSolrHome);
+    System.clearProperty("managed.schema.mutable");
+  }
+
+}
\ No newline at end of file