diff --git a/graph/db/graph_test.go b/graph/db/graph_test.go
index 2f2527a14..cab857fee 100644
--- a/graph/db/graph_test.go
+++ b/graph/db/graph_test.go
@@ -4232,6 +4232,15 @@ func TestGraphLoading(t *testing.T) {
 	// Next, create the graph for the first time.
 	graphStore := NewTestDB(t)
 
+	// Temporarily add a manual skip for this test, until all the methods
+	// it uses have been implemented on the SQLStore struct. We have to
+	// manually add this skip because it is the only test that doesn't use
+	// the MakeTestGraph helper to create the graph store.
+	_, ok := graphStore.(*KVStore)
+	if !ok {
+		t.Skipf("Skipping TestGraphLoading for non-bbolt graph store")
+	}
+
 	graph, err := NewChannelGraph(graphStore)
 	require.NoError(t, err)
 	require.NoError(t, graph.Start())
diff --git a/graph/db/test_kvdb.go b/graph/db/test_kvdb.go
index 0dd3bd2ff..f325d41f0 100644
--- a/graph/db/test_kvdb.go
+++ b/graph/db/test_kvdb.go
@@ -10,7 +10,7 @@ import (
 )
 
 // NewTestDB is a helper function that creates an BBolt database for testing.
-func NewTestDB(t testing.TB) *KVStore {
+func NewTestDB(t testing.TB) V1Store {
 	backend, backendCleanup, err := kvdb.GetTestBackend(t.TempDir(), "cgr")
 	require.NoError(t, err)
 
diff --git a/graph/db/test_postgres.go b/graph/db/test_postgres.go
index 0c2163083..7509a5907 100644
--- a/graph/db/test_postgres.go
+++ b/graph/db/test_postgres.go
@@ -14,7 +14,7 @@ import (
 // NewTestDB is a helper function that creates a SQLStore backed by a postgres
 // database for testing. At the moment, it embeds a KVStore but once the
 // SQLStore fully implements the V1Store interface, the KVStore will be removed.
-func NewTestDB(t testing.TB) *SQLStore {
+func NewTestDB(t testing.TB) V1Store {
 	backend, backendCleanup, err := kvdb.GetTestBackend(t.TempDir(), "cgr")
 	require.NoError(t, err)
 
diff --git a/graph/db/test_sqlite.go b/graph/db/test_sqlite.go
index 5cfe16812..601bba6fb 100644
--- a/graph/db/test_sqlite.go
+++ b/graph/db/test_sqlite.go
@@ -14,7 +14,7 @@ import (
 // NewTestDB is a helper function that creates a SQLStore backed by a sqlite
 // database for testing. At the moment, it embeds a KVStore but once the
 // SQLStore fully implements the V1Store interface, the KVStore will be removed.
-func NewTestDB(t testing.TB) *SQLStore {
+func NewTestDB(t testing.TB) V1Store {
 	backend, backendCleanup, err := kvdb.GetTestBackend(t.TempDir(), "cgr")
 	require.NoError(t, err)