diff --git a/settings.gradle b/settings.gradle
index 3cbd0ee1..06ecb65d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 include ':vtm'
+include ':vtm-tests'
 include ':vtm-extras'
 include ':vtm-android'
 include ':vtm-android-example'
diff --git a/vtm-tests/build.gradle b/vtm-tests/build.gradle
new file mode 100644
index 00000000..3acb6285
--- /dev/null
+++ b/vtm-tests/build.gradle
@@ -0,0 +1,15 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+
+dependencies {
+  compile project(':vtm')
+  testCompile 'junit:junit:4.11'
+  testCompile 'org.mockito:mockito-all:1.9.5'
+  testCompile 'org.easytesting:fest-assert-core:2.0M10'
+  testCompile 'com.squareup.okhttp:mockwebserver:1.5.2'
+}
+
+sourceSets {
+  main.java.srcDirs = ['src']
+  test.java.srcDirs = ['test']
+}
diff --git a/vtm/test/org/oscim/tiling/source/OkHttpEngineTest.java b/vtm-tests/test/org/oscim/tiling/source/OkHttpEngineTest.java
similarity index 100%
rename from vtm/test/org/oscim/tiling/source/OkHttpEngineTest.java
rename to vtm-tests/test/org/oscim/tiling/source/OkHttpEngineTest.java
diff --git a/vtm/test/org/oscim/tiling/source/UrlTileSourceTest.java b/vtm-tests/test/org/oscim/tiling/source/UrlTileSourceTest.java
similarity index 100%
rename from vtm/test/org/oscim/tiling/source/UrlTileSourceTest.java
rename to vtm-tests/test/org/oscim/tiling/source/UrlTileSourceTest.java
diff --git a/vtm/test/org/oscim/tiling/source/bitmap/BitmapTileSourceTest.java b/vtm-tests/test/org/oscim/tiling/source/bitmap/BitmapTileSourceTest.java
similarity index 74%
rename from vtm/test/org/oscim/tiling/source/bitmap/BitmapTileSourceTest.java
rename to vtm-tests/test/org/oscim/tiling/source/bitmap/BitmapTileSourceTest.java
index 8fde2545..34f87ce5 100644
--- a/vtm/test/org/oscim/tiling/source/bitmap/BitmapTileSourceTest.java
+++ b/vtm-tests/test/org/oscim/tiling/source/bitmap/BitmapTileSourceTest.java
@@ -1,13 +1,13 @@
 package org.oscim.tiling.source.bitmap;
 
+import static org.fest.assertions.api.Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.oscim.tiling.ITileDataSource;
-import org.oscim.tiling.source.LwHttp;
-import org.oscim.tiling.source.OkHttpEngine;
-
-import static org.fest.assertions.api.Assertions.assertThat;
+import org.oscim.tiling.source.OkHttpEngine.OkHttpFactory;
+import org.oscim.tiling.source.UrlTileDataSource;
 
 public class BitmapTileSourceTest {
 	private BitmapTileSource tileSource;
@@ -24,7 +24,7 @@ public class BitmapTileSourceTest {
 
 	@Test
 	public void shouldUseLwHttp() throws Exception {
-		LwHttp lwHttp = Mockito.mock(LwHttp.class);
+		LwHttpFactory lwHttp = Mockito.mock(LwHttpFactory.class);
 		tileSource.setHttpEngine(lwHttp);
 		ITileDataSource dataSource = tileSource.getDataSource();
 		dataSource.destroy();
@@ -33,11 +33,11 @@ public class BitmapTileSourceTest {
 
 	@Test
 	public void shouldUseOkHttp() throws Exception {
-		OkHttpEngine okHttp = Mockito.mock(OkHttpEngine.class);
+		OkHttpFactory okHttp = Mockito.mock(OkHttpFactory.class);
 		tileSource.setHttpEngine(okHttp);
-		ITileDataSource dataSource = tileSource.getDataSource();
+		UrlTileDataSource dataSource = (UrlTileDataSource) tileSource.getDataSource();
 		dataSource.destroy();
-		Mockito.verify(okHttp).close();
+		//Mockito.verify(dataSource.mConn).close();
 	}
 
 	class TestBitmapTileSource extends BitmapTileSource {
diff --git a/vtm/test/org/oscim/tiling/source/oscimap4/OSciMap4TileSourceTest.java b/vtm-tests/test/org/oscim/tiling/source/oscimap4/OSciMap4TileSourceTest.java
similarity index 100%
rename from vtm/test/org/oscim/tiling/source/oscimap4/OSciMap4TileSourceTest.java
rename to vtm-tests/test/org/oscim/tiling/source/oscimap4/OSciMap4TileSourceTest.java
diff --git a/vtm/build.gradle b/vtm/build.gradle
index f27d0b20..6f148d81 100644
--- a/vtm/build.gradle
+++ b/vtm/build.gradle
@@ -7,15 +7,10 @@ dependencies {
   compile 'org.slf4j:slf4j-api:1.7.6'
   compile 'com.squareup.okhttp:okhttp:1.5.2'
   providedCompile 'com.google.code.findbugs:annotations:2.0.1'
-  testCompile 'junit:junit:4.11'
-  testCompile 'org.mockito:mockito-all:1.9.5'
-  testCompile 'org.easytesting:fest-assert-core:2.0M10'
-  testCompile 'com.squareup.okhttp:mockwebserver:1.5.2'
 }
 
 sourceSets {
   main.java.srcDirs = ['src']
-  test.java.srcDirs = ['test']
   main.resources.srcDirs = ['resources']
   main.compileClasspath += configurations.providedCompile
 }