diff --git a/satellite/satellitedb/usercredits_test.go b/satellite/console/usercredits_test.go
similarity index 99%
rename from satellite/satellitedb/usercredits_test.go
rename to satellite/console/usercredits_test.go
index 208d3cdaa..b13f46cc0 100644
--- a/satellite/satellitedb/usercredits_test.go
+++ b/satellite/console/usercredits_test.go
@@ -1,7 +1,7 @@
 // Copyright (C) 2019 Storj Labs, Inc.
 // See LICENSE for copying information.
 
-package satellitedb_test
+package console_test
 
 import (
 	"context"
@@ -19,7 +19,7 @@ import (
 	"storj.io/storj/satellite/satellitedb/satellitedbtest"
 )
 
-func TestUsercredits(t *testing.T) {
+func TestUserCredits(t *testing.T) {
 	satellitedbtest.Run(t, func(t *testing.T, db satellite.DB) {
 		ctx := testcontext.New(t)
 		defer ctx.Cleanup()
diff --git a/satellite/satellitedb/repairqueue_test.go b/satellite/repair/queue/queue2_test.go
similarity index 96%
rename from satellite/satellitedb/repairqueue_test.go
rename to satellite/repair/queue/queue2_test.go
index d548147bd..4be09c159 100644
--- a/satellite/satellitedb/repairqueue_test.go
+++ b/satellite/repair/queue/queue2_test.go
@@ -1,7 +1,7 @@
 // Copyright (C) 2019 Storj Labs, Inc.
 // See LICENSE for copying information.
 
-package satellitedb_test
+package queue_test
 
 import (
 	"context"
@@ -21,7 +21,7 @@ import (
 	"storj.io/storj/storage"
 )
 
-func TestRepairQueue(t *testing.T) {
+func TestUntilEmpty(t *testing.T) {
 	satellitedbtest.Run(t, func(t *testing.T, db satellite.DB) {
 		ctx := testcontext.New(t)
 		defer ctx.Cleanup()
@@ -54,7 +54,7 @@ func TestRepairQueue(t *testing.T) {
 	})
 }
 
-func TestRepairQueueOrder(t *testing.T) {
+func TestOrder(t *testing.T) {
 	satellitedbtest.Run(t, func(t *testing.T, db satellite.DB) {
 		ctx := testcontext.New(t)
 		defer ctx.Cleanup()
@@ -72,6 +72,7 @@ func TestRepairQueueOrder(t *testing.T) {
 			require.NoError(t, err)
 		}
 
+		// TODO: remove dependency on *dbx.DB
 		dbAccess := db.(interface{ TestDBAccess() *dbx.DB }).TestDBAccess()
 		var timeConvertPrefix string
 		switch d := dbAccess.DB.Driver().(type) {
@@ -129,7 +130,7 @@ func TestRepairQueueOrder(t *testing.T) {
 	})
 }
 
-func TestRepairQueueCount(t *testing.T) {
+func TestCount(t *testing.T) {
 	satellitedbtest.Run(t, func(t *testing.T, db satellite.DB) {
 		ctx := testcontext.New(t)
 		defer ctx.Cleanup()