diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
index a217040d1df5ce8c5452172b3896e03398a54326..b9dc114c1d752596432c5228c8b5ddffc45f01c7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,14 @@
 
 package org.springframework.beans.support;
 
-import org.junit.Test;
+import java.util.Comparator;
 
-import org.springframework.util.comparator.CompoundComparator;
+import org.junit.Test;
 
 import static org.junit.Assert.*;
 
 /**
- * Unit tests for {@link PropertyComparator}
- *
- * @see org.springframework.util.comparator.ComparatorTests
+ * Unit tests for {@link PropertyComparator}.
  *
  * @author Keith Donald
  * @author Chris Beams
@@ -40,7 +38,7 @@ public class PropertyComparatorTests {
 		Dog dog2 = new Dog();
 		dog2.setNickName("biscy");
 
-		PropertyComparator c = new PropertyComparator("nickName", false, true);
+		PropertyComparator<Dog> c = new PropertyComparator<>("nickName", false, true);
 		assertTrue(c.compare(dog, dog2) > 0);
 		assertTrue(c.compare(dog, dog) == 0);
 		assertTrue(c.compare(dog2, dog) < 0);
@@ -50,15 +48,13 @@ public class PropertyComparatorTests {
 	public void testPropertyComparatorNulls() {
 		Dog dog = new Dog();
 		Dog dog2 = new Dog();
-		PropertyComparator c = new PropertyComparator("nickName", false, true);
+		PropertyComparator<Dog> c = new PropertyComparator<>("nickName", false, true);
 		assertTrue(c.compare(dog, dog2) == 0);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testCompoundComparator() {
-		CompoundComparator<Dog> c = new CompoundComparator<>();
-		c.addComparator(new PropertyComparator("lastName", false, true));
+		Comparator<Dog> c = new PropertyComparator<>("lastName", false, true);
 
 		Dog dog1 = new Dog();
 		dog1.setFirstName("macy");
@@ -70,19 +66,17 @@ public class PropertyComparatorTests {
 
 		assertTrue(c.compare(dog1, dog2) == 0);
 
-		c.addComparator(new PropertyComparator("firstName", false, true));
+		c = c.thenComparing(new PropertyComparator<>("firstName", false, true));
 		assertTrue(c.compare(dog1, dog2) > 0);
 
 		dog2.setLastName("konikk dog");
 		assertTrue(c.compare(dog2, dog1) > 0);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testCompoundComparatorInvert() {
-		CompoundComparator<Dog> c = new CompoundComparator<>();
-		c.addComparator(new PropertyComparator("lastName", false, true));
-		c.addComparator(new PropertyComparator("firstName", false, true));
+		Comparator<Dog> c = (new PropertyComparator<Dog>("lastName", false, true)).
+				thenComparing(new PropertyComparator<>("firstName", false, true));
 		Dog dog1 = new Dog();
 		dog1.setFirstName("macy");
 		dog1.setLastName("grayspots");
@@ -92,7 +86,7 @@ public class PropertyComparatorTests {
 		dog2.setLastName("grayspots");
 
 		assertTrue(c.compare(dog1, dog2) > 0);
-		c.invertOrder();
+		c = c.reversed();
 		assertTrue(c.compare(dog1, dog2) < 0);
 	}
 
@@ -106,11 +100,6 @@ public class PropertyComparatorTests {
 
 		private String lastName;
 
-		@Override
-		public int compareTo(Object o) {
-			return nickName.compareTo(((Dog)o).nickName);
-		}
-
 		public String getNickName() {
 			return nickName;
 		}
@@ -134,6 +123,11 @@ public class PropertyComparatorTests {
 		public void setLastName(String lastName) {
 			this.lastName = lastName;
 		}
+
+		@Override
+		public int compareTo(Object o) {
+			return this.nickName.compareTo(((Dog) o).nickName);
+		}
 	}
 
 }
diff --git a/spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java b/spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java
index d8808c5d8fde787b30932089b0441e01c382ad59..bff535d67581911d957fa08a652dd0cab92ba40b 100644
--- a/spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +23,13 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 /**
- * Test for {@link ComparableComparator}.
+ * Test for {@link CompoundComparator}.
  *
  * @author Keith Donald
  * @author Chris Beams
  * @author Phillip Webb
  */
+@Deprecated
 public class CompoundComparatorTests {
 
 	@Rule
diff --git a/spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java b/spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java
index cd8cce1e1f0cc4c2c2a523d0af052356d6c60224..7e3abd4c3d78f3c4ce19a249020d4ed7cdbb5290 100644
--- a/spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,10 +30,11 @@ import static org.junit.Assert.*;
  * @author Chris Beams
  * @author Phillip Webb
  */
-
+@Deprecated
 public class InvertibleComparatorTests {
 
-	private Comparator<Integer> comparator = new ComparableComparator<>();
+	private final Comparator<Integer> comparator = new ComparableComparator<>();
+
 
 	@Test(expected = IllegalArgumentException.class)
 	public void shouldNeedComparator() throws Exception {
@@ -47,16 +48,14 @@ public class InvertibleComparatorTests {
 
 	@Test
 	public void shouldDefaultToAscending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator =
-				new InvertibleComparator<>(comparator);
+		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator);
 		assertThat(invertibleComparator.isAscending(), is(true));
 		assertThat(invertibleComparator.compare(1, 2), is(-1));
 	}
 
 	@Test
 	public void shouldInvert() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator =
-				new InvertibleComparator<>(comparator);
+		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator);
 		assertThat(invertibleComparator.isAscending(), is(true));
 		assertThat(invertibleComparator.compare(1, 2), is(-1));
 		invertibleComparator.invertOrder();
@@ -66,15 +65,13 @@ public class InvertibleComparatorTests {
 
 	@Test
 	public void shouldCompareAscending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator =
-				new InvertibleComparator<>(comparator, true);
+		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator, true);
 		assertThat(invertibleComparator.compare(1, 2), is(-1));
 	}
 
 	@Test
 	public void shouldCompareDescending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator =
-				new InvertibleComparator<>(comparator, false);
+		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator, false);
 		assertThat(invertibleComparator.compare(1, 2), is(1));
 	}