diff --git a/enabler/src/de/schildbach/pte/NaldoProvider.java b/enabler/src/de/schildbach/pte/NaldoProvider.java
index 243af1aa..ef501de7 100644
--- a/enabler/src/de/schildbach/pte/NaldoProvider.java
+++ b/enabler/src/de/schildbach/pte/NaldoProvider.java
@@ -17,23 +17,19 @@
 
 package de.schildbach.pte;
 
-import java.io.IOException;
-
-import de.schildbach.pte.dto.Location;
-import de.schildbach.pte.dto.LocationType;
-import de.schildbach.pte.dto.SuggestLocationsResult;
-
 /**
  * @author Andreas Schildbach
  */
 public class NaldoProvider extends AbstractEfaProvider
 {
 	public static final NetworkId NETWORK_ID = NetworkId.NALDO;
-	private final static String API_BASE = "http://efa.naldo.de/naldo/";
+	private final static String API_BASE = "http://efa2.naldo.de/naldo/";
 
 	public NaldoProvider()
 	{
 		super(API_BASE);
+
+		setIncludeRegionId(false);
 	}
 
 	public NetworkId id()
@@ -53,10 +49,4 @@ public class NaldoProvider extends AbstractEfaProvider
 
 		return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName);
 	}
-
-	@Override
-	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
-	{
-		return xmlStopfinderRequest(new Location(LocationType.STATION, null, null, constraint.toString()));
-	}
 }
diff --git a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
index e054ddb0..9523e669 100644
--- a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
@@ -69,6 +69,13 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest
 		print(result);
 	}
 
+	@Test
+	public void queryDeparturesInvalidStation() throws Exception
+	{
+		final QueryDeparturesResult result = queryDepartures("999999", false);
+		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
+	}
+
 	@Test
 	public void suggestLocationsIncomplete() throws Exception
 	{
@@ -88,8 +95,9 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void shortTrip() throws Exception
 	{
-		final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "3019697", null, "Amberg Kurfürstenbad"), null, new Location(
-				LocationType.STATION, "3019500", null, "Amberg Bahnhof"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
+		final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "8029333", 48492484, 9207456, "Reutlingen", "ZOB"), null,
+				new Location(LocationType.STATION, "8029109", 48496968, 9213320, "Reutlingen", "Bismarckstr."), new Date(), true, Product.ALL,
+				WalkSpeed.NORMAL, Accessibility.NEUTRAL);
 		print(result);
 		assertEquals(QueryTripsResult.Status.OK, result.status);
 		assertTrue(result.trips.size() > 0);