diff --git a/.travis.yml b/.travis.yml
index 48055c1b..fee67c0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ env:
     - DB_PASS=
     - DB_DATABASE=test
     - GO_ENV=test
+    - STATUP_DIR=$GOPATH/src/github.com/hunterlong/statup
 
 matrix:
   allow_failures:
diff --git a/cmd/main_test.go b/cmd/main_test.go
index 67198780..75d32e1d 100644
--- a/cmd/main_test.go
+++ b/cmd/main_test.go
@@ -27,6 +27,10 @@ var (
 
 func init() {
 	dir = utils.Directory
+	os.Remove(dir + "/statup.db")
+	//os.Remove(gopath+"/cmd/config.yml")
+	os.RemoveAll(dir + "/cmd/assets")
+	os.RemoveAll(dir + "/logs")
 }
 
 func RunInit(t *testing.T) {
@@ -42,8 +46,8 @@ func RunInit(t *testing.T) {
 func TestRunAll(t *testing.T) {
 	//t.Parallel()
 
-	//databases := []string{"sqlite", "postgres", "mysql"}
-	databases := []string{"sqlite"}
+	databases := []string{"sqlite", "postgres", "mysql"}
+	//databases := []string{"sqlite"}
 
 	for _, dbt := range databases {
 
@@ -195,9 +199,9 @@ func TestAssetsCommand(t *testing.T) {
 	c.Run()
 	t.Log(c.Stdout())
 	t.Log("Directory for Assets: ", dir)
-	assert.True(t, fileExists("../assets/robots.txt"))
-	assert.True(t, fileExists("../assets/js/main.js"))
-	assert.True(t, fileExists("../assets/scss/base.scss"))
+	assert.FileExists(t, dir+"/cmd/assets/robots.txt")
+	assert.FileExists(t, dir+"/cmd/assets/js/main.js")
+	assert.FileExists(t, dir+"/cmd/assets/scss/base.scss")
 }
 
 func RunMakeDatabaseConfig(t *testing.T, db string) {
@@ -560,13 +564,6 @@ func RunSettingsHandler(t *testing.T) {
 	assert.True(t, strings.Contains(rr.Body.String(), "footer"))
 }
 
-func Cleanup(t *testing.T) {
-	os.Remove(dir + "/statup.db")
-	//os.Remove(gopath+"/cmd/config.yml")
-	os.RemoveAll(dir + "/assets")
-	os.RemoveAll(dir + "/logs")
-}
-
 func fileExists(file string) bool {
 	if _, err := os.Stat(file); os.IsNotExist(err) {
 		return false
diff --git a/source/source_test.go b/source/source_test.go
index dee7560f..6d65fe62 100644
--- a/source/source_test.go
+++ b/source/source_test.go
@@ -15,16 +15,13 @@ func init() {
 	dir = utils.Directory
 	utils.InitLogs()
 	Assets()
+	os.RemoveAll(dir + "/cmd/assets")
 }
 
 func TestCore_UsingAssets(t *testing.T) {
 	assert.False(t, UsingAssets)
 }
 
-func TestHasAssets(t *testing.T) {
-	assert.False(t, HasAssets(dir))
-}
-
 func TestCreateAssets(t *testing.T) {
 	assert.Nil(t, CreateAllAssets(dir))
 	assert.True(t, HasAssets(dir))
diff --git a/utils/utils.go b/utils/utils.go
index 4f8170a6..0e5695e1 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -14,7 +14,11 @@ var (
 )
 
 func init() {
-	Directory = dir()
+	if os.Getenv("STATUP_DIR") != "" {
+		Directory = os.Getenv("STATUP_DIR")
+	} else {
+		Directory = dir()
+	}
 }
 
 func StringInt(s string) int64 {