diff --git a/src/main/java/org/springframework/hateoas/client/Traverson.java b/src/main/java/org/springframework/hateoas/client/Traverson.java
index d8f0ea00..ad7ed7f6 100644
--- a/src/main/java/org/springframework/hateoas/client/Traverson.java
+++ b/src/main/java/org/springframework/hateoas/client/Traverson.java
@@ -40,7 +40,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.plugin.core.OrderAwarePluginRegistry;
+import org.springframework.plugin.core.PluginRegistry;
 import org.springframework.util.Assert;
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
@@ -161,7 +161,7 @@ public class Traverson {
 				? DEFAULTS.getLinkDiscoverers(mediaTypes) //
 				: discoverer;
 
-		this.discoverers = new LinkDiscoverers(OrderAwarePluginRegistry.of(defaultedDiscoverers));
+		this.discoverers = new LinkDiscoverers(PluginRegistry.of(defaultedDiscoverers));
 
 		return this;
 	}
diff --git a/src/test/java/org/springframework/hateoas/client/LinkDiscoverersUnitTest.java b/src/test/java/org/springframework/hateoas/client/LinkDiscoverersUnitTest.java
index fe1fa218..c965d926 100755
--- a/src/test/java/org/springframework/hateoas/client/LinkDiscoverersUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/client/LinkDiscoverersUnitTest.java
@@ -19,11 +19,7 @@ import static org.assertj.core.api.Assertions.*;
 
 import org.junit.Test;
 import org.springframework.core.Ordered;
-import org.springframework.hateoas.client.JsonPathLinkDiscoverer;
-import org.springframework.hateoas.client.LinkDiscoverer;
-import org.springframework.hateoas.client.LinkDiscoverers;
 import org.springframework.http.MediaType;
-import org.springframework.plugin.core.OrderAwarePluginRegistry;
 import org.springframework.plugin.core.PluginRegistry;
 
 /**
@@ -45,7 +41,8 @@ public class LinkDiscoverersUnitTest {
 		LinkDiscoverer low = new LowPriorityLinkDiscoverer();
 		LinkDiscoverer high = new HighPriorityLinkDiscoverer();
 
-		PluginRegistry<LinkDiscoverer, MediaType> registry = OrderAwarePluginRegistry.of(low, high);
+		PluginRegistry<LinkDiscoverer, MediaType> registry = PluginRegistry.of(low, high);
+
 		assertThat(registry.getRequiredPluginFor(MediaType.APPLICATION_JSON)).isEqualTo(high);
 	}
 
diff --git a/src/test/java/org/springframework/hateoas/server/core/DelegatingRelProviderUnitTest.java b/src/test/java/org/springframework/hateoas/server/core/DelegatingRelProviderUnitTest.java
index 258da357..b31d90d9 100755
--- a/src/test/java/org/springframework/hateoas/server/core/DelegatingRelProviderUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/server/core/DelegatingRelProviderUnitTest.java
@@ -20,11 +20,6 @@ import static org.assertj.core.api.Assertions.*;
 import org.junit.Test;
 import org.springframework.hateoas.LinkRelation;
 import org.springframework.hateoas.server.LinkRelationProvider;
-import org.springframework.hateoas.server.core.AnnotationLinkRelationProvider;
-import org.springframework.hateoas.server.core.DefaultLinkRelationProvider;
-import org.springframework.hateoas.server.core.DelegatingLinkRelationProvider;
-import org.springframework.hateoas.server.core.Relation;
-import org.springframework.plugin.core.OrderAwarePluginRegistry;
 import org.springframework.plugin.core.PluginRegistry;
 
 /**
@@ -37,7 +32,7 @@ public class DelegatingRelProviderUnitTest {
 	@Test
 	public void foo() {
 
-		PluginRegistry<LinkRelationProvider, Class<?>> registry = OrderAwarePluginRegistry.of(new AnnotationLinkRelationProvider(),
+		PluginRegistry<LinkRelationProvider, Class<?>> registry = PluginRegistry.of(new AnnotationLinkRelationProvider(),
 				new DefaultLinkRelationProvider());
 
 		LinkRelationProvider delegatingProvider = new DelegatingLinkRelationProvider(registry);