diff --git a/solr/core/src/java/org/apache/solr/core/RequestHandlers.java b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
index 58d0449f3a1..18339e5fd4d 100644
--- a/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
+++ b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
@@ -433,14 +433,14 @@ public final class RequestHandlers {
         return;
       }
 
-      version = _pluginInfo.attributes.get("version");
-      if (version == null) {
+      if (_pluginInfo.attributes.get("version") == null ){
         errMsg = "ERROR 'lib' attribute must be accompanied with version also";
         unrecoverable = true;
         _handler = this;
         log.error(errMsg);
         return;
       }
+      version = String.valueOf(_pluginInfo.attributes.get("version"));
       classLoader = new MemClassLoader(this);
     }
 
diff --git a/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java b/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
index d71849a7db2..a679e7430b2 100644
--- a/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
+++ b/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
@@ -30,6 +30,7 @@ import org.junit.After;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -132,7 +133,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
 
 
     payload = "{\n" +
-        "'update-requesthandler' : { 'name' : '/test1', 'class': 'org.apache.solr.core.BlobStoreTestRequestHandlerV2' , 'lib':'test','version':'2'}\n" +
+        "'update-requesthandler' : { 'name' : '/test1', 'class': 'org.apache.solr.core.BlobStoreTestRequestHandlerV2' , 'lib':'test','version':2}\n" +
         "}";
 
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
@@ -142,7 +143,7 @@ public class TestDynamicLoading extends AbstractFullDistribZkTestBase {
         "/config/overlay?wt=json",
         null,
         Arrays.asList("overlay", "requestHandler", "/test1", "version"),
-        "2",10);
+        2l,10);
 
     success= false;
     for(int i=0;i<100;i++) {
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index 2e82f181efb..443f71cbab6 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -233,7 +233,7 @@ public class TestSolrConfigHandler extends RestTestBase {
                                             String testServerBaseUrl,
                                             String uri,
                                             CloudSolrClient cloudSolrServer,List<String> jsonPath,
-                                            String expected,
+                                            Object expected,
                                             long maxTimeoutSeconds ) throws Exception {
 
     boolean success = false;