diff --git a/buffalo/cmd/filetests/new_travis.json b/buffalo/cmd/filetests/new_travis.json
index 8dbb78b14..b4b484b74 100644
--- a/buffalo/cmd/filetests/new_travis.json
+++ b/buffalo/cmd/filetests/new_travis.json
@@ -2,11 +2,10 @@
   "path": ".travis.yml",
   "contains": [
     "language: go",
-    "1.7.x",
-    "master",
+    "1.8.x",
     "go_import_path:"
   ]
-},{
+}, {
   "path": "database.yml",
   "contains": [
     "dialect: \"sqlite3\"",
@@ -14,4 +13,4 @@
     "production:",
     "test:"
   ]
-}]
\ No newline at end of file
+}]
diff --git a/generators/newapp/new.go b/generators/newapp/new.go
index 4498d17b4..0f65a0508 100644
--- a/generators/newapp/new.go
+++ b/generators/newapp/new.go
@@ -131,20 +131,38 @@ func (a App) goGet() *exec.Cmd {
 	return exec.Command(envy.Get("GO_BIN", "go"), appArgs...)
 }
 
-const nTravis = `language: go
-env:
-- GO_ENV=test
-
-before_script:
-  - psql -c 'create database {{.name}}_test;' -U postgres
-	- mysql -e 'CREATE DATABASE {{.name}}_test;'
-  - mkdir -p $TRAVIS_BUILD_DIR/public/assets
+const nTravis = `
+language: go
 
 go:
-  - 1.7.x
-  - master
+  - 1.8.x
 
-go_import_path: {{ .packagePath }}
+env:
+  - GO_ENV=test
+
+{{ if eq .dbType "postgres" -}}
+services:
+  - postgresql
+{{ end -}}
+
+before_script:
+	{{ if eq .dbType "postgres" -}}
+	- psql -c 'create database {{.name}}_test;' -U postgres
+	{{ end -}}
+	- mkdir -p $TRAVIS_BUILD_DIR/public/assets
+
+go_import_path: {{.packagePath}}
+
+install:
+  - go get github.com/gobuffalo/buffalo/buffalo
+	{{ if .withDep -}}
+  - go get github.com/golang/dep/cmd/dep
+  - dep ensure
+	{{ else -}}
+	- go get $(go list ./... | grep -v /vendor/)
+	{{ end -}}
+
+script: buffalo test
 `
 
 const nGitlabCi = `before_script: