diff --git a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
index 2c2b2d33..7d2da8b6 100644
--- a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
@@ -17,11 +17,11 @@
 
 package de.schildbach.pte.live;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.Date;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 
 import de.schildbach.pte.BahnProvider;
@@ -75,7 +75,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
 
 		print(autocompletes);
 
-		Assert.assertEquals("Güntzelstr. (U), Berlin", autocompletes.get(0).name);
+		assertEquals("Güntzelstr. (U), Berlin", autocompletes.get(0).name);
 	}
 
 	@Test
@@ -85,7 +85,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
 
 		print(autocompletes);
 
-		Assert.assertEquals("Hamburg Landungsbrücken", autocompletes.get(0).name);
+		assertEquals("Hamburg Landungsbrücken", autocompletes.get(0).name);
 	}
 
 	@Test
@@ -158,7 +158,7 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
 				LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
 		System.out.println(result);
 
-		Assert.assertEquals(QueryConnectionsResult.Status.TOO_CLOSE, result.status);
+		assertEquals(QueryConnectionsResult.Status.TOO_CLOSE, result.status);
 	}
 
 	@Test
@@ -168,6 +168,6 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
 				LocationType.STATION, 8010205, null, "Leipzig Hbf"), new Date(0), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
 		System.out.println(result);
 
-		Assert.assertEquals(QueryConnectionsResult.Status.INVALID_DATE, result.status);
+		assertEquals(QueryConnectionsResult.Status.INVALID_DATE, result.status);
 	}
 }
diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
index a20f25f5..9071c31a 100644
--- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
@@ -17,7 +17,7 @@
 
 package de.schildbach.pte.live;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
 import java.util.List;
diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
index b02df042..9f330658 100644
--- a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
@@ -17,11 +17,11 @@
 
 package de.schildbach.pte.live;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.Date;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 
 import de.schildbach.pte.MvvProvider;
@@ -65,7 +65,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
 	{
 		final QueryDeparturesResult result = provider.queryDepartures(2, 0, false);
 
-		Assert.assertEquals(QueryDeparturesResult.Status.OK, result.status);
+		assertEquals(QueryDeparturesResult.Status.OK, result.status);
 		print(result);
 	}
 
@@ -74,7 +74,7 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
 	{
 		final QueryDeparturesResult result = provider.queryDepartures(999999, 0, false);
 
-		Assert.assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
+		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
 	}
 
 	@Test
@@ -162,11 +162,11 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
 		final QueryConnectionsResult result1 = queryConnections(new Location(LocationType.STATION, 2, "München", "Marienplatz"), null, new Location(
 				LocationType.STATION, 99999, 0, 0, null, null), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
 
-		Assert.assertEquals(QueryConnectionsResult.Status.UNKNOWN_TO, result1.status);
+		assertEquals(QueryConnectionsResult.Status.UNKNOWN_TO, result1.status);
 
 		final QueryConnectionsResult result2 = queryConnections(new Location(LocationType.STATION, 99999, 0, 0, null, null), null, new Location(
 				LocationType.STATION, 2, "München", "Marienplatz"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
 
-		Assert.assertEquals(QueryConnectionsResult.Status.UNKNOWN_FROM, result2.status);
+		assertEquals(QueryConnectionsResult.Status.UNKNOWN_FROM, result2.status);
 	}
 }
diff --git a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
index 271c4517..9719bd13 100644
--- a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
@@ -17,7 +17,7 @@
 
 package de.schildbach.pte.live;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
 import java.util.List;
diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
index 3ad96978..96d225e0 100644
--- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
@@ -17,7 +17,7 @@
 
 package de.schildbach.pte.live;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
 import java.util.List;
diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
index d870a7ec..3427107d 100644
--- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
@@ -17,7 +17,7 @@
 
 package de.schildbach.pte.live;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
 import java.util.List;