diff --git a/pkg/repositories/in_memory_test.go b/pkg/repositories/in_memory_test.go
new file mode 100644
index 00000000..d991eef7
--- /dev/null
+++ b/pkg/repositories/in_memory_test.go
@@ -0,0 +1,16 @@
+package repositories_test
+
+import (
+	"github.com/8thlight/vulcanizedb/pkg/repositories"
+	"github.com/8thlight/vulcanizedb/pkg/repositories/testing"
+	_ "github.com/lib/pq"
+	. "github.com/onsi/ginkgo"
+)
+
+var _ = Describe("In memory repository", func() {
+
+	testing.AssertRepositoryBehavior(func() repositories.Repository {
+		return repositories.NewInMemory()
+	})
+
+})
diff --git a/pkg/repositories/postgres_test.go b/pkg/repositories/postgres_test.go
new file mode 100644
index 00000000..adfcef6d
--- /dev/null
+++ b/pkg/repositories/postgres_test.go
@@ -0,0 +1,70 @@
+package repositories_test
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/8thlight/vulcanizedb/pkg/config"
+	"github.com/8thlight/vulcanizedb/pkg/core"
+	"github.com/8thlight/vulcanizedb/pkg/repositories"
+	"github.com/8thlight/vulcanizedb/pkg/repositories/testing"
+	"github.com/jmoiron/sqlx"
+	_ "github.com/lib/pq"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Postgres repository", func() {
+
+	It("connects to the database", func() {
+		cfg, _ := config.NewConfig("private")
+		pgConfig := config.DbConnectionString(cfg.Database)
+		db, err := sqlx.Connect("postgres", pgConfig)
+		Expect(err).Should(BeNil())
+		Expect(db).ShouldNot(BeNil())
+	})
+
+	testing.AssertRepositoryBehavior(func() repositories.Repository {
+		cfg, _ := config.NewConfig("private")
+		repository := repositories.NewPostgres(cfg.Database)
+		testing.ClearData(repository)
+		return repository
+	})
+
+	It("does not commit block if block is invalid", func() {
+		//badNonce violates db Nonce field length
+		badNonce := fmt.Sprintf("x %s", strings.Repeat("1", 100))
+		badBlock := core.Block{
+			Number:       123,
+			Nonce:        badNonce,
+			Transactions: []core.Transaction{},
+		}
+		cfg, _ := config.NewConfig("private")
+		repository := repositories.NewPostgres(cfg.Database)
+
+		err := repository.CreateBlock(badBlock)
+		savedBlock := repository.FindBlockByNumber(123)
+
+		Expect(err).ToNot(BeNil())
+		Expect(savedBlock).To(BeNil())
+	})
+
+	It("does not commit block or transactions if transaction is invalid", func() {
+		//badHash violates db To field length
+		badHash := fmt.Sprintf("x %s", strings.Repeat("1", 100))
+		badTransaction := core.Transaction{To: badHash}
+		block := core.Block{
+			Number:       123,
+			Transactions: []core.Transaction{badTransaction},
+		}
+		cfg, _ := config.NewConfig("private")
+		repository := repositories.NewPostgres(cfg.Database)
+
+		err := repository.CreateBlock(block)
+		savedBlock := repository.FindBlockByNumber(123)
+
+		Expect(err).ToNot(BeNil())
+		Expect(savedBlock).To(BeNil())
+	})
+
+})
diff --git a/pkg/repositories/repository_test.go b/pkg/repositories/repository_test.go
deleted file mode 100644
index 14bf8872..00000000
--- a/pkg/repositories/repository_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package repositories_test
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/8thlight/vulcanizedb/pkg/config"
-	"github.com/8thlight/vulcanizedb/pkg/core"
-	"github.com/8thlight/vulcanizedb/pkg/repositories"
-	"github.com/8thlight/vulcanizedb/pkg/repositories/testing"
-	"github.com/jmoiron/sqlx"
-	_ "github.com/lib/pq"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Repositories", func() {
-
-	Describe("In memory repository", func() {
-		testing.AssertRepositoryBehavior(func() repositories.Repository {
-			return repositories.NewInMemory()
-		})
-	})
-
-	Describe("Postgres repository", func() {
-		It("connects to the database", func() {
-			cfg, _ := config.NewConfig("private")
-			pgConfig := config.DbConnectionString(cfg.Database)
-			db, err := sqlx.Connect("postgres", pgConfig)
-			Expect(err).Should(BeNil())
-			Expect(db).ShouldNot(BeNil())
-		})
-
-		It("does not commit block if block is invalid", func() {
-			//badNonce violates db Nonce field length
-			badNonce := fmt.Sprintf("x %s", strings.Repeat("1", 100))
-			badBlock := core.Block{
-				Number:       123,
-				Nonce:        badNonce,
-				Transactions: []core.Transaction{},
-			}
-			cfg, _ := config.NewConfig("private")
-			repository := repositories.NewPostgres(cfg.Database)
-
-			err := repository.CreateBlock(badBlock)
-			savedBlock := repository.FindBlockByNumber(123)
-
-			Expect(err).ToNot(BeNil())
-			Expect(savedBlock).To(BeNil())
-		})
-
-		It("does not commit block or transactions if transaction is invalid", func() {
-			//badHash violates db To field length
-			badHash := fmt.Sprintf("x %s", strings.Repeat("1", 100))
-			badTransaction := core.Transaction{To: badHash}
-			block := core.Block{
-				Number:       123,
-				Transactions: []core.Transaction{badTransaction},
-			}
-			cfg, _ := config.NewConfig("private")
-			repository := repositories.NewPostgres(cfg.Database)
-
-			err := repository.CreateBlock(block)
-			savedBlock := repository.FindBlockByNumber(123)
-
-			Expect(err).ToNot(BeNil())
-			Expect(savedBlock).To(BeNil())
-		})
-
-		testing.AssertRepositoryBehavior(func() repositories.Repository {
-			cfg, _ := config.NewConfig("private")
-			repository := repositories.NewPostgres(cfg.Database)
-			testing.ClearData(repository)
-			return repository
-		})
-	})
-
-})