diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledTest.java b/dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledTest.java
index 6571477f3c..3cfdf55fc6 100644
--- a/dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledTest.java
+++ b/dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledTest.java
@@ -7,19 +7,18 @@
  */
 package org.dspace.app.opensearch;
 
+/*
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
+*/
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.springframework.mock.web.MockHttpServletResponse;
-
 /*
 import org.dspace.app.rest.OpenSearchController;
 import org.dspace.services.ConfigurationService;
@@ -36,13 +35,14 @@ import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.eperson.Group;
 */
+
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
-import org.junit.Test;
-import org.junit.Before;
-import org.springframework.test.web.servlet.MockMvc;
+
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
+
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Integration test to test the /opensearch endpoint
diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerTest.java b/dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerTest.java
index 34ec434377..00ccc7cec0 100644
--- a/dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerTest.java
+++ b/dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerTest.java
@@ -7,18 +7,18 @@
  */
 package org.dspace.app.opensearch;
 
+/*
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
+*/
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import org.springframework.mock.web.MockHttpServletResponse;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath;
 
 /*
 import org.dspace.app.rest.OpenSearchController;
@@ -36,14 +36,13 @@ import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.eperson.Group;
 */
+
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
-import org.junit.Test;
-import org.junit.Before;
-import org.springframework.test.web.servlet.MockMvc;
+
 import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
-import org.springframework.test.web.servlet.result.XpathResultMatchers;
+
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Integration test to test the /opensearch endpoint