diff --git a/java/com.googlecode.java-diff-utils.test/META-INF/MANIFEST.MF b/java/com.googlecode.java-diff-utils.test/META-INF/MANIFEST.MF
index a0f6352b6f1..80bca9383ed 100644
--- a/java/com.googlecode.java-diff-utils.test/META-INF/MANIFEST.MF
+++ b/java/com.googlecode.java-diff-utils.test/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ClassPath: test/,
  .
 Import-Package: junit.framework;version="4.8.1"
 Automatic-Module-Name: com.googlecode.java-diff-utils.test
+Require-Bundle: org.junit
diff --git a/java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java b/java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java
index 9042745801e..b32882c37a6 100755
--- a/java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java
+++ b/java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java
@@ -1,15 +1,26 @@
 package diffutils;
 
-import difflib.*;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class DiffTest extends TestCase {
+import org.junit.Test;
 
+import difflib.ChangeDelta;
+import difflib.Chunk;
+import difflib.DeleteDelta;
+import difflib.Delta;
+import difflib.DiffUtils;
+import difflib.InsertDelta;
+import difflib.Patch;
+
+public class DiffTest {
+
+    @Test
     public void testDiff_Insert() {
         final Patch<String> patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk"));
         assertNotNull(patch);
@@ -21,6 +32,7 @@ public class DiffTest extends TestCase {
         assertEquals(new Chunk<String>(1, Arrays.asList("jjj", "kkk")), delta.getRevised());
     }
 
+    @Test
     public void testDiff_Delete() {
         final Patch<String> patch = DiffUtils.diff(Arrays.asList("ddd", "fff", "ggg"), Arrays.asList("ggg"));
         assertNotNull(patch);
@@ -32,6 +44,7 @@ public class DiffTest extends TestCase {
         assertEquals(new Chunk<String>(0, emptyList), delta.getRevised());
     }
 
+    @Test
     public void testDiff_Change() {
         final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc");
         final List<String> changeTest_to = Arrays.asList("aaa", "zzz", "ccc");
@@ -45,12 +58,14 @@ public class DiffTest extends TestCase {
         assertEquals(new Chunk<String>(1, Arrays.asList("zzz")), delta.getRevised());
     }
 
+    @Test
     public void testDiff_EmptyList() {
         final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), new ArrayList<String>());
         assertNotNull(patch);
         assertEquals(0, patch.getDeltas().size());
     }
 
+    @Test
     public void testDiff_EmptyListWithNonEmpty() {
         final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), Arrays.asList("aaa"));
         assertNotNull(patch);
diff --git a/java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java b/java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java
index c651bef4b65..fada3663f44 100755
--- a/java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java
+++ b/java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java
@@ -1,9 +1,7 @@
 package diffutils;
 
-import difflib.DiffUtils;
-import difflib.Patch;
-import difflib.PatchFailedException;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -14,7 +12,13 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-public class GenerateUnifiedDiffTest extends TestCase {
+import org.junit.Test;
+
+import difflib.DiffUtils;
+import difflib.Patch;
+import difflib.PatchFailedException;
+
+public class GenerateUnifiedDiffTest {
     private static final String FS = File.separator;
     private static final String MOCK_FOLDER = "test" + FS + "mocks" + FS;
 
@@ -34,6 +38,7 @@ public class GenerateUnifiedDiffTest extends TestCase {
         return lines;
     }
 
+    @Test
     public void testGenerateUnified() {
         List<String> origLines = fileToLines(MOCK_FOLDER + "original.txt");
         List<String> revLines = fileToLines(MOCK_FOLDER + "revised.txt");
@@ -41,6 +46,7 @@ public class GenerateUnifiedDiffTest extends TestCase {
         verify(origLines, revLines, "original.txt", "revised.txt");
     }
 
+    @Test
     public void testGenerateUnifiedWithOneDelta() {
         List<String> origLines = fileToLines(MOCK_FOLDER + "one_delta_test_original.txt");
         List<String> revLines = fileToLines(MOCK_FOLDER + "one_delta_test_revised.txt");
@@ -48,12 +54,14 @@ public class GenerateUnifiedDiffTest extends TestCase {
         verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
     }
 
+    @Test
     public void testGenerateUnifiedDiffWithoutAnyDeltas() {
         List<String> test = Arrays.asList("abc");
         Patch<String> patch = DiffUtils.diff(test, test);
         DiffUtils.generateUnifiedDiff("abc", "abc", test, patch, 0);
     }
 
+    @Test
     public void testDiff_Issue10() {
         final List<String> baseLines = fileToLines(MOCK_FOLDER + "issue10_base.txt");
         final List<String> patchLines = fileToLines(MOCK_FOLDER + "issue10_patch.txt");
@@ -68,12 +76,14 @@ public class GenerateUnifiedDiffTest extends TestCase {
     /**
      * Issue 12
      */
+    @Test
     public void testPatchWithNoDeltas() {
         final List<String> lines1 = fileToLines(MOCK_FOLDER + "issue11_1.txt");
         final List<String> lines2 = fileToLines(MOCK_FOLDER + "issue11_2.txt");
         verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
     }
 
+    @Test
     public void testDiff5() {
         final List<String> lines1 = fileToLines(MOCK_FOLDER + "5A.txt");
         final List<String> lines2 = fileToLines(MOCK_FOLDER + "5B.txt");
@@ -83,6 +93,7 @@ public class GenerateUnifiedDiffTest extends TestCase {
     /**
      * Issue 19
      */
+    @Test
     public void testDiffWithHeaderLineInText() {
         List<String> original = new ArrayList<String>();
         List<String> revised  = new ArrayList<String>();
diff --git a/java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java b/java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java
index 46fe5f417e5..aa9e979ec68 100755
--- a/java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java
+++ b/java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java
@@ -1,16 +1,20 @@
 package diffutils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
 import difflib.DiffUtils;
 import difflib.Patch;
 import difflib.PatchFailedException;
 
-public class PatchTest extends TestCase {
-
+public class PatchTest {
+    @Test
     public void testPatch_Insert()  {
         final List<String> insertTest_from = Arrays.asList("hhh");
         final List<String> insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
@@ -23,6 +27,7 @@ public class PatchTest extends TestCase {
         }
     }
 
+    @Test
     public void testPatch_Delete() {
         final List<String> deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
         final List<String> deleteTest_to = Arrays.asList("ggg");
@@ -35,6 +40,7 @@ public class PatchTest extends TestCase {
         }
     }
 
+    @Test
     public void testPatch_Change() {
         final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
         final List<String> changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
@@ -47,6 +53,7 @@ public class PatchTest extends TestCase {
         }
     }
 
+    @Test
     public void testPatch_EntirelyDifferent() {
         final List<String> changeTest_from = new ArrayList<String>();
         changeTest_from.add("aaa");