diff --git a/commands_test.go b/commands_test.go
index 9043ac4..3dd6fb5 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -1,12 +1,10 @@
-package main_test
+package main
 
 import (
 	"flag"
-	"github.com/adrianmacneil/dbmate"
 	"github.com/adrianmacneil/dbmate/driver"
 	"github.com/codegangsta/cli"
 	"github.com/stretchr/testify/require"
-	"io"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -28,7 +26,7 @@ func testContext(t *testing.T, u *url.URL) *cli.Context {
 	err = os.Setenv("DATABASE_URL", u.String())
 	require.Nil(t, err)
 
-	app := main.NewApp()
+	app := NewApp()
 	flagset := flag.NewFlagSet(app.Name, flag.ContinueOnError)
 	for _, f := range app.Flags {
 		f.Apply(flagset)
@@ -73,18 +71,12 @@ func testURLs(t *testing.T) []*url.URL {
 	}
 }
 
-func mustClose(c io.Closer) {
-	if err := c.Close(); err != nil {
-		panic(err)
-	}
-}
-
 func TestGetDatabaseUrl(t *testing.T) {
 	envURL, err := url.Parse("foo://example.org/db")
 	require.Nil(t, err)
 	ctx := testContext(t, envURL)
 
-	u, err := main.GetDatabaseURL(ctx)
+	u, err := GetDatabaseURL(ctx)
 	require.Nil(t, err)
 
 	require.Equal(t, "foo", u.Scheme)
@@ -96,13 +88,13 @@ func testMigrateCommandURL(t *testing.T, u *url.URL) {
 	ctx := testContext(t, u)
 
 	// drop and recreate database
-	err := main.DropCommand(ctx)
+	err := DropCommand(ctx)
 	require.Nil(t, err)
-	err = main.CreateCommand(ctx)
+	err = CreateCommand(ctx)
 	require.Nil(t, err)
 
 	// migrate
-	err = main.MigrateCommand(ctx)
+	err = MigrateCommand(ctx)
 	require.Nil(t, err)
 
 	// verify results
@@ -131,11 +123,11 @@ func testUpCommandURL(t *testing.T, u *url.URL) {
 	ctx := testContext(t, u)
 
 	// drop database
-	err := main.DropCommand(ctx)
+	err := DropCommand(ctx)
 	require.Nil(t, err)
 
 	// create and migrate
-	err = main.UpCommand(ctx)
+	err = UpCommand(ctx)
 	require.Nil(t, err)
 
 	// verify results
@@ -164,11 +156,11 @@ func testRollbackCommandURL(t *testing.T, u *url.URL) {
 	ctx := testContext(t, u)
 
 	// drop, recreate, and migrate database
-	err := main.DropCommand(ctx)
+	err := DropCommand(ctx)
 	require.Nil(t, err)
-	err = main.CreateCommand(ctx)
+	err = CreateCommand(ctx)
 	require.Nil(t, err)
-	err = main.MigrateCommand(ctx)
+	err = MigrateCommand(ctx)
 	require.Nil(t, err)
 
 	// verify migration
@@ -183,7 +175,7 @@ func testRollbackCommandURL(t *testing.T, u *url.URL) {
 	require.Equal(t, 1, count)
 
 	// rollback
-	err = main.RollbackCommand(ctx)
+	err = RollbackCommand(ctx)
 	require.Nil(t, err)
 
 	// verify rollback
diff --git a/driver/driver_test.go b/driver/driver_test.go
index 5c4c576..d4e43fd 100644
--- a/driver/driver_test.go
+++ b/driver/driver_test.go
@@ -1,21 +1,20 @@
-package driver_test
+package driver
 
 import (
-	"github.com/adrianmacneil/dbmate/driver"
 	"github.com/adrianmacneil/dbmate/driver/postgres"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
 
 func TestGet_Postgres(t *testing.T) {
-	drv, err := driver.Get("postgres")
+	drv, err := Get("postgres")
 	require.Nil(t, err)
 	_, ok := drv.(postgres.Driver)
 	require.Equal(t, true, ok)
 }
 
 func TestGet_Error(t *testing.T) {
-	drv, err := driver.Get("foo")
+	drv, err := Get("foo")
 	require.Equal(t, "Unknown driver: foo", err.Error())
 	require.Nil(t, drv)
 }
diff --git a/driver/mysql/mysql_test.go b/driver/mysql/mysql_test.go
index 6f741ac..7cf9cef 100644
--- a/driver/mysql/mysql_test.go
+++ b/driver/mysql/mysql_test.go
@@ -1,10 +1,8 @@
-package mysql_test
+package mysql
 
 import (
 	"database/sql"
-	"github.com/adrianmacneil/dbmate/driver/mysql"
 	"github.com/stretchr/testify/require"
-	"io"
 	"net/url"
 	"os"
 	"testing"
@@ -24,14 +22,8 @@ func testURL(t *testing.T) *url.URL {
 	return u
 }
 
-func mustClose(c io.Closer) {
-	if err := c.Close(); err != nil {
-		panic(err)
-	}
-}
-
 func prepTestDB(t *testing.T) *sql.DB {
-	drv := mysql.Driver{}
+	drv := Driver{}
 	u := testURL(t)
 
 	// drop any existing database
@@ -50,7 +42,7 @@ func prepTestDB(t *testing.T) *sql.DB {
 }
 
 func TestCreateDropDatabase(t *testing.T) {
-	drv := mysql.Driver{}
+	drv := Driver{}
 	u := testURL(t)
 
 	// drop any existing database
@@ -88,7 +80,7 @@ func TestCreateDropDatabase(t *testing.T) {
 }
 
 func TestDatabaseExists(t *testing.T) {
-	drv := mysql.Driver{}
+	drv := Driver{}
 	u := testURL(t)
 
 	// drop any existing database
@@ -111,7 +103,7 @@ func TestDatabaseExists(t *testing.T) {
 }
 
 func TestDatabaseExists_Error(t *testing.T) {
-	drv := mysql.Driver{}
+	drv := Driver{}
 	u := testURL(t)
 	u.User = url.User("invalid")
 
@@ -121,7 +113,7 @@ func TestDatabaseExists_Error(t *testing.T) {
 }
 
 func TestCreateMigrationsTable(t *testing.T) {
-	drv := mysql.Driver{}
+	drv := Driver{}
 	db := prepTestDB(t)
 	defer mustClose(db)
 
@@ -144,7 +136,7 @@ func TestCreateMigrationsTable(t *testing.T) {
 }
 
 func TestSelectMigrations(t *testing.T) {
-	drv := mysql.Driver{}
+	drv := Driver{}
 	db := prepTestDB(t)
 	defer mustClose(db)
 
@@ -170,7 +162,7 @@ func TestSelectMigrations(t *testing.T) {
 }
 
 func TestInsertMigration(t *testing.T) {
-	drv := mysql.Driver{}
+	drv := Driver{}
 	db := prepTestDB(t)
 	defer mustClose(db)
 
@@ -193,7 +185,7 @@ func TestInsertMigration(t *testing.T) {
 }
 
 func TestDeleteMigration(t *testing.T) {
-	drv := mysql.Driver{}
+	drv := Driver{}
 	db := prepTestDB(t)
 	defer mustClose(db)
 
diff --git a/driver/postgres/postgres_test.go b/driver/postgres/postgres_test.go
index cd672c0..2d29fa3 100644
--- a/driver/postgres/postgres_test.go
+++ b/driver/postgres/postgres_test.go
@@ -1,10 +1,8 @@
-package postgres_test
+package postgres
 
 import (
 	"database/sql"
-	"github.com/adrianmacneil/dbmate/driver/postgres"
 	"github.com/stretchr/testify/require"
-	"io"
 	"net/url"
 	"os"
 	"testing"
@@ -25,14 +23,8 @@ func testURL(t *testing.T) *url.URL {
 	return u
 }
 
-func mustClose(c io.Closer) {
-	if err := c.Close(); err != nil {
-		panic(err)
-	}
-}
-
 func prepTestDB(t *testing.T) *sql.DB {
-	drv := postgres.Driver{}
+	drv := Driver{}
 	u := testURL(t)
 
 	// drop any existing database
@@ -51,7 +43,7 @@ func prepTestDB(t *testing.T) *sql.DB {
 }
 
 func TestCreateDropDatabase(t *testing.T) {
-	drv := postgres.Driver{}
+	drv := Driver{}
 	u := testURL(t)
 
 	// drop any existing database
@@ -89,7 +81,7 @@ func TestCreateDropDatabase(t *testing.T) {
 }
 
 func TestDatabaseExists(t *testing.T) {
-	drv := postgres.Driver{}
+	drv := Driver{}
 	u := testURL(t)
 
 	// drop any existing database
@@ -112,7 +104,7 @@ func TestDatabaseExists(t *testing.T) {
 }
 
 func TestDatabaseExists_Error(t *testing.T) {
-	drv := postgres.Driver{}
+	drv := Driver{}
 	u := testURL(t)
 	u.User = url.User("invalid")
 
@@ -122,7 +114,7 @@ func TestDatabaseExists_Error(t *testing.T) {
 }
 
 func TestCreateMigrationsTable(t *testing.T) {
-	drv := postgres.Driver{}
+	drv := Driver{}
 	db := prepTestDB(t)
 	defer mustClose(db)
 
@@ -145,7 +137,7 @@ func TestCreateMigrationsTable(t *testing.T) {
 }
 
 func TestSelectMigrations(t *testing.T) {
-	drv := postgres.Driver{}
+	drv := Driver{}
 	db := prepTestDB(t)
 	defer mustClose(db)
 
@@ -171,7 +163,7 @@ func TestSelectMigrations(t *testing.T) {
 }
 
 func TestInsertMigration(t *testing.T) {
-	drv := postgres.Driver{}
+	drv := Driver{}
 	db := prepTestDB(t)
 	defer mustClose(db)
 
@@ -194,7 +186,7 @@ func TestInsertMigration(t *testing.T) {
 }
 
 func TestDeleteMigration(t *testing.T) {
-	drv := postgres.Driver{}
+	drv := Driver{}
 	db := prepTestDB(t)
 	defer mustClose(db)
 
diff --git a/driver/shared/shared_test.go b/driver/shared/shared_test.go
index 1585459..f0e7a1a 100644
--- a/driver/shared/shared_test.go
+++ b/driver/shared/shared_test.go
@@ -1,7 +1,6 @@
-package shared_test
+package shared
 
 import (
-	"github.com/adrianmacneil/dbmate/driver/shared"
 	"github.com/stretchr/testify/require"
 	"net/url"
 	"testing"
@@ -11,7 +10,7 @@ func TestDatabaseName(t *testing.T) {
 	u, err := url.Parse("ignore://localhost/foo?query")
 	require.Nil(t, err)
 
-	name := shared.DatabaseName(u)
+	name := DatabaseName(u)
 	require.Equal(t, "foo", name)
 }
 
@@ -19,6 +18,6 @@ func TestDatabaseName_Empty(t *testing.T) {
 	u, err := url.Parse("ignore://localhost")
 	require.Nil(t, err)
 
-	name := shared.DatabaseName(u)
+	name := DatabaseName(u)
 	require.Equal(t, "", name)
 }