diff --git a/.travis.yml b/.travis.yml
index 23a9f55..accdadb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,7 @@ addons:
       #   https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-trusty
       packages:
         - postgresql-9.5-postgis-2.3
+        - osmosis
         - chrpath
 
 before_script:
diff --git a/test/Makefile b/test/Makefile
index daf9382..5e94683 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,15 +9,17 @@ endif
 all: test
 
 clean:
-	rm generated/*.{pbf,gz}
+	rm -rf build
 
-PBF_FILES=$(addprefix generated/,$(patsubst %.osm,%.pbf,$(wildcard *.osm)))
-OSCGZ_FILES=$(addprefix generated/,$(patsubst %.osc,%.osc.gz,$(wildcard *.osc)))
+PBF_FILES=$(addprefix build/,$(patsubst %.osm,%.pbf,$(wildcard *.osm)))
+OSCGZ_FILES=$(addprefix build/,$(patsubst %.osc,%.osc.gz,$(wildcard *.osc)))
 
-generated/%.pbf: %.osm
+build/%.pbf: %.osm
+	@mkdir -p build
 	osmosis --read-xml $< --sort type="TypeThenId" --write-pbf $@ omitmetadata=true
 
-generated/%.osc.gz: %.osc
+build/%.osc.gz: %.osc
+	@mkdir -p build
 	gzip --stdout $< > $@
 
 files: $(PBF_FILES) $(OSCGZ_FILES)
diff --git a/test/any_any_test.go b/test/any_any_test.go
index e39caa6..7859265 100644
--- a/test/any_any_test.go
+++ b/test/any_any_test.go
@@ -20,7 +20,7 @@ func TestAnyAny_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "generated/any_any.pbf",
+		osmFileName:     "build/any_any.pbf",
 		mappingFileName: "any_any_mapping.json",
 	}
 	ts.g = geos.NewGeos()
diff --git a/test/completedb_test.go b/test/completedb_test.go
index 76b86c3..12810cd 100644
--- a/test/completedb_test.go
+++ b/test/completedb_test.go
@@ -29,7 +29,7 @@ func TestComplete_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "generated/complete_db.pbf",
+		osmFileName:     "build/complete_db.pbf",
 		mappingFileName: "complete_db_mapping.json",
 	}
 	ts.g = geos.NewGeos()
@@ -400,7 +400,7 @@ func TestComplete_HstoreTags(t *testing.T) {
 // #######################################################################
 
 func TestComplete_Update(t *testing.T) {
-	ts.updateOsm(t, "./generated/complete_db.osc.gz")
+	ts.updateOsm(t, "./build/complete_db.osc.gz")
 }
 
 // #######################################################################
diff --git a/test/expire_tiles_test.go b/test/expire_tiles_test.go
index 9dc9024..1b2fca6 100644
--- a/test/expire_tiles_test.go
+++ b/test/expire_tiles_test.go
@@ -24,7 +24,7 @@ func TestExpireTiles_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "generated/expire_tiles.pbf",
+		osmFileName:     "build/expire_tiles.pbf",
 		mappingFileName: "expire_tiles_mapping.yml",
 		expireTileDir:   filepath.Join(ts.dir, "expiretiles"),
 	}
@@ -62,7 +62,7 @@ func TestExpireTiles_Elements(t *testing.T) {
 }
 
 func TestExpireTiles_Update(t *testing.T) {
-	ts.updateOsm(t, "generated/expire_tiles.osc.gz")
+	ts.updateOsm(t, "build/expire_tiles.osc.gz")
 }
 
 func TestExpireTiles_CheckExpireFile(t *testing.T) {
diff --git a/test/generated/README b/test/generated/README
deleted file mode 100644
index 22bd933..0000000
--- a/test/generated/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Files in this directory are generated by `make files` in ./test by calling osmosis and gzip.
-The sources for these files are in ./test.
-
-Generated files need to be commited in separate commit! Otherwise source and
-generated file will have the same mtime when checked out from git and make will
-try to regenerate the file.
diff --git a/test/generated/any_any.pbf b/test/generated/any_any.pbf
deleted file mode 100644
index eb2476e..0000000
Binary files a/test/generated/any_any.pbf and /dev/null differ
diff --git a/test/generated/complete_db.osc.gz b/test/generated/complete_db.osc.gz
deleted file mode 100644
index c8e1f5a..0000000
Binary files a/test/generated/complete_db.osc.gz and /dev/null differ
diff --git a/test/generated/complete_db.pbf b/test/generated/complete_db.pbf
deleted file mode 100644
index 6724884..0000000
Binary files a/test/generated/complete_db.pbf and /dev/null differ
diff --git a/test/generated/expire_tiles.osc.gz b/test/generated/expire_tiles.osc.gz
deleted file mode 100644
index e5971aa..0000000
Binary files a/test/generated/expire_tiles.osc.gz and /dev/null differ
diff --git a/test/generated/expire_tiles.pbf b/test/generated/expire_tiles.pbf
deleted file mode 100644
index 99445a4..0000000
Binary files a/test/generated/expire_tiles.pbf and /dev/null differ
diff --git a/test/generated/route_relation.osc.gz b/test/generated/route_relation.osc.gz
deleted file mode 100644
index 8b0b926..0000000
Binary files a/test/generated/route_relation.osc.gz and /dev/null differ
diff --git a/test/generated/route_relation.pbf b/test/generated/route_relation.pbf
deleted file mode 100644
index 0e19827..0000000
Binary files a/test/generated/route_relation.pbf and /dev/null differ
diff --git a/test/generated/single_table.osc.gz b/test/generated/single_table.osc.gz
deleted file mode 100644
index fa984be..0000000
Binary files a/test/generated/single_table.osc.gz and /dev/null differ
diff --git a/test/generated/single_table.pbf b/test/generated/single_table.pbf
deleted file mode 100644
index 48dc3df..0000000
Binary files a/test/generated/single_table.pbf and /dev/null differ
diff --git a/test/route_relation_test.go b/test/route_relation_test.go
index 748c40f..d2e0669 100644
--- a/test/route_relation_test.go
+++ b/test/route_relation_test.go
@@ -20,7 +20,7 @@ func TestRouteRelation_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "generated/route_relation.pbf",
+		osmFileName:     "build/route_relation.pbf",
 		mappingFileName: "route_relation_mapping.yml",
 	}
 	ts.g = geos.NewGeos()
@@ -107,7 +107,7 @@ func TestRouteRelation_NoRouteWithMissingMember(t *testing.T) {
 // #######################################################################
 
 func TestRouteRelation_Update(t *testing.T) {
-	ts.updateOsm(t, "./generated/route_relation.osc.gz")
+	ts.updateOsm(t, "./build/route_relation.osc.gz")
 }
 
 // #######################################################################
diff --git a/test/single_table_test.go b/test/single_table_test.go
index a7db5c1..b34dbac 100644
--- a/test/single_table_test.go
+++ b/test/single_table_test.go
@@ -23,7 +23,7 @@ func TestSingleTable_Prepare(t *testing.T) {
 	ts.config = importConfig{
 		connection:      "postgis://",
 		cacheDir:        ts.dir,
-		osmFileName:     "generated/single_table.pbf",
+		osmFileName:     "build/single_table.pbf",
 		mappingFileName: "single_table_mapping.json",
 	}
 	ts.g = geos.NewGeos()
@@ -167,7 +167,7 @@ func TestSingleTable_DuplicateIds1(t *testing.T) {
 // #######################################################################
 
 func TestSingleTable_Update(t *testing.T) {
-	ts.updateOsm(t, "./generated/single_table.osc.gz")
+	ts.updateOsm(t, "./build/single_table.osc.gz")
 }
 
 // #######################################################################