diff --git a/exercises/palindrome-products/src/example/java/Palindromes.java b/exercises/palindrome-products/src/example/java/PalindromeCalculator.java
similarity index 82%
rename from exercises/palindrome-products/src/example/java/Palindromes.java
rename to exercises/palindrome-products/src/example/java/PalindromeCalculator.java
index 911e52fee..525a498a2 100644
--- a/exercises/palindrome-products/src/example/java/Palindromes.java
+++ b/exercises/palindrome-products/src/example/java/PalindromeCalculator.java
@@ -1,8 +1,8 @@
 import java.util.*;
 
-public class Palindromes {
+public class PalindromeCalculator {
 
-    public static SortedMap<Long, List<List<Integer>>> getPalindromeProductsWithFactors(int minFactor, int maxFactor) {
+    public SortedMap<Long, List<List<Integer>>> getPalindromeProductsWithFactors(int minFactor, int maxFactor) {
         SortedMap<Long, List<List<Integer>>> palindromeSortedList = new TreeMap<>();
         long num;
         List<List<Integer>> factors;
@@ -23,7 +23,7 @@ public static SortedMap<Long, List<List<Integer>>> getPalindromeProductsWithFact
     }
 
     // http://stackoverflow.com/questions/23984654/how-to-print-all-palindromes-upto-1000-without-using-any-string-stringbuilder
-    private static long reverseNumber(long number) {
+    private long reverseNumber(long number) {
         if (number < 10l) {
             return number;
         }
@@ -37,7 +37,7 @@ private static long reverseNumber(long number) {
         return result;
     }
 
-    private static boolean isPalindrome(long number) {
+    private boolean isPalindrome(long number) {
         return number == reverseNumber(number);
     }
 }
diff --git a/exercises/palindrome-products/src/test/java/PalindromesTest.java b/exercises/palindrome-products/src/test/java/PalindromeCalculatorTest.java
similarity index 86%
rename from exercises/palindrome-products/src/test/java/PalindromesTest.java
rename to exercises/palindrome-products/src/test/java/PalindromeCalculatorTest.java
index c87095c3c..8b583f07b 100644
--- a/exercises/palindrome-products/src/test/java/PalindromesTest.java
+++ b/exercises/palindrome-products/src/test/java/PalindromeCalculatorTest.java
@@ -1,3 +1,4 @@
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -9,7 +10,13 @@
 
 import static junit.framework.TestCase.*;
 
-public class PalindromesTest {
+public class PalindromeCalculatorTest {
+    private PalindromeCalculator palindromeCalculator;
+
+    @Before
+    public void setup() {
+        palindromeCalculator = new PalindromeCalculator();
+    }
 
     @Test
     public void largestPalindromeFromSingleDigitFactors() {
@@ -21,7 +28,7 @@ public void largestPalindromeFromSingleDigitFactors() {
         );
         final long expectedValue = 9l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(1, 9);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(1, 9);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
@@ -36,7 +43,7 @@ public void largestPalindromeFromDoubleDigitFactors() {
         );
         final long expectedValue = 9009l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(10, 99);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(10, 99);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
@@ -51,7 +58,7 @@ public void smallestPalindromeFromDoubleDigitFactors() {
         );
         final long expectedValue = 121l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(10, 99);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(10, 99);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.firstKey());
     }
@@ -66,7 +73,7 @@ public void largestPalindromeFromTripleDigitFactors() {
         );
         final long expectedValue = 906609l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(100, 999);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(100, 999);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.lastKey());
     }
@@ -81,7 +88,7 @@ public void smallestPalindromeFromTripleDigitFactors() {
         );
         final long expectedValue = 10201l;
 
-        final SortedMap<Long, List<List<Integer>>> palindromes = Palindromes.getPalindromeProductsWithFactors(100, 999);
+        final SortedMap<Long, List<List<Integer>>> palindromes = palindromeCalculator.getPalindromeProductsWithFactors(100, 999);
 
         checkPalindromeWithFactorsMatchesExpected(expected, expectedValue, palindromes, palindromes.firstKey());
     }