diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/enabler/src/de/schildbach/pte/NvbwProvider.java
index c7f5a099..6f57edb1 100644
--- a/enabler/src/de/schildbach/pte/NvbwProvider.java
+++ b/enabler/src/de/schildbach/pte/NvbwProvider.java
@@ -17,11 +17,6 @@
 
 package de.schildbach.pte;
 
-import java.io.IOException;
-import java.util.List;
-
-import de.schildbach.pte.dto.Location;
-import de.schildbach.pte.dto.LocationType;
 
 /**
  * @author Andreas Schildbach
@@ -35,6 +30,7 @@ public class NvbwProvider extends AbstractEfaProvider
 	{
 		super(API_BASE);
 
+		setIncludeRegionId(false);
 		setUseRouteIndexAsConnectionId(false);
 	}
 
@@ -51,10 +47,4 @@ public class NvbwProvider extends AbstractEfaProvider
 
 		return false;
 	}
-
-	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
-	{
-		return xmlStopfinderRequest(new Location(LocationType.STATION, 0, null, constraint.toString()));
-	}
 }
diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
index 4894e848..7cf80019 100644
--- a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
@@ -17,7 +17,9 @@
 
 package de.schildbach.pte.live;
 
+import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
@@ -85,6 +87,22 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
 		print(autocompletes);
 	}
 
+	@Test
+	public void autocompleteCoverage() throws Exception
+	{
+		final List<Location> freiburgAutocompletes = provider.autocompleteStations("Freiburg Hauptbahnhof");
+		print(freiburgAutocompletes);
+		assertThat(freiburgAutocompletes, hasItem(new Location(LocationType.STATION, 6906508)));
+
+		final List<Location> baselAutocompletes = provider.autocompleteStations("Basel");
+		print(baselAutocompletes);
+		assertThat(baselAutocompletes, hasItem(new Location(LocationType.STATION, 51000007)));
+
+		final List<Location> constanceAutocompletes = provider.autocompleteStations("Konstanz");
+		print(constanceAutocompletes);
+		assertThat(constanceAutocompletes, hasItem(new Location(LocationType.STATION, 8706554)));
+	}
+
 	@Test
 	public void shortConnection() throws Exception
 	{