diff --git a/storage/storage.lisp b/storage/storage.lisp
index 847a745..80f9239 100644
--- a/storage/storage.lisp
+++ b/storage/storage.lisp
@@ -45,12 +45,11 @@
 
 (defun connect-sqlite (params config)
   (declare (ignorable params))
-  (print config)
-  (apply #'dbi:connect-cached (cons :sqlite3 (getf config :connect-args))))
+  (apply #'dbi:connect-cached :sqlite3 (getf config :connect-args)))
 
 (defun connect-postgres (params config)
   (declare (ignorable params))
-  (apply #'dbi:connect (cons :postgres (getf config :connect-args))))
+  (apply #'dbi:connect-cached :postgres (getf config :connect-args)))
 
 (defvar *db-params*
   '(:sqlite3 (:connect connect-sqlite 
diff --git a/test/config-postgres.lisp b/test/config-postgres.lisp
new file mode 100644
index 0000000..0e3048a
--- /dev/null
+++ b/test/config-postgres.lisp
@@ -0,0 +1,15 @@
+;;; cl-scopes/test/config-postgres.lisp
+;;; use: `(load "test/...")` from package scopes/test-storage
+
+(defparameter db-config-postgres
+  '(:db-type :postgres
+    :connect-args
+     (:database-name "cltest"
+	  :host "localhost"
+	  :port 5432
+	  :username "testuser"
+	  :password "secret")
+    :options
+	 (:schema "testing")))
+
+(setf scopes/test-storage:*db-config-test* db-config-postgres)
diff --git a/test/config-sqlite.lisp b/test/config-sqlite.lisp
new file mode 100644
index 0000000..ce0dfa7
--- /dev/null
+++ b/test/config-sqlite.lisp
@@ -0,0 +1,11 @@
+;;; cl-scopes/test/config-sqlite.lisp
+;;; use: `(load "test/...")` from package scopes/test-storage
+
+(defparameter db-config-sqlite
+  '(:db-type :sqlite3
+    :connect-args
+	 (:database-name "test/test.db")
+    :options nil))
+
+(setf scopes/test-storage:*db-config-test* db-config-sqlite)
+
diff --git a/test/etc.lisp b/test/etc.lisp
deleted file mode 100644
index c1d74ec..0000000
--- a/test/etc.lisp
+++ /dev/null
@@ -1,22 +0,0 @@
-;;; cl-scopes/test/etc.lisp
-;;; use: `(load "test/etc")` from package scopes/test-storage
-
-(defparameter db-config-sqlite
-  '(:db-type :sqlite3
-    :connect-args
-	 (:database-name "test/test.db")
-    :options nil))
-
-(defparameter db-config-postgres
-  '(:db-type :postgres
-    :connect-args
-     (:database-name "cltest"
-	  :host "localhost"
-	  :port 5432
-	  :username "testuser"
-	  :password "secret")
-    :options
-	 (:schema "testing")))
-
-(setf scopes/test-storage:*db-config-sqlite* db-config-sqlite)
-(setf scopes/test-storage:*db-config-postgres* db-config-postgres)
diff --git a/test/test-storage.lisp b/test/test-storage.lisp
index e345dd1..1c8dddb 100644
--- a/test/test-storage.lisp
+++ b/test/test-storage.lisp
@@ -7,26 +7,26 @@
   (:local-nicknames (:storage :scopes/storage)
                     (:tracking :scopes/storage/tracking) 
                     (:t :scopes/testing))
-  (:export #:*db-config-postgres* #:*db-config-sqlite*
+  (:export #:*db-config-test*
            #:run #:run-all #:run-postgres #:run-sqlite)
   (:import-from :scopes/testing #:==))
 
 (in-package :scopes/test-storage)
 
-(defparameter *db-config-sqlite* nil)
-(defparameter *db-config-postgres* nil)
-(load "test/etc")
+(defparameter *db-config-test* nil)
 
 (defun run-all ()
   (run-sqlite)
   (run-postgres))
 
 (defun run-sqlite ()
-  (let ((storage:*db-config* *db-config-sqlite*))
+  (load "test/config-sqlite")
+  (let ((storage:*db-config* *db-config-test*))
     (run)))
 
 (defun run-postgres ()
-  (let ((storage:*db-config* *db-config-postgres*))
+  (load "test/config-postgres")
+  (let ((storage:*db-config* *db-config-test*))
     (run)))
 
 (defun run ()