diff --git a/persistence/db_storm/storm.go b/persistence/db_storm/storm.go
index 7102b2472..669d18512 100644
--- a/persistence/db_storm/storm.go
+++ b/persistence/db_storm/storm.go
@@ -1,10 +1,8 @@
 package db_storm
 
 import (
-	"fmt"
 	"os"
 	"path"
-	"path/filepath"
 	"sync"
 
 	"github.com/asdine/storm"
@@ -24,7 +22,6 @@ func Db() *storm.DB {
 			panic(err)
 		}
 		dbPath := path.Join(conf.Sonic.DbPath, "storm.db")
-		dbPath = fmt.Sprintf(".%c%s", filepath.Separator, dbPath)
 		instance, err := storm.Open(dbPath)
 		log.Debug("Opening Storm DB from: " + dbPath)
 		if err != nil {
diff --git a/persistence/db_storm/storm_suite_test.go b/persistence/db_storm/storm_suite_test.go
index d1a91c0da..2499f99bc 100644
--- a/persistence/db_storm/storm_suite_test.go
+++ b/persistence/db_storm/storm_suite_test.go
@@ -1,15 +1,19 @@
 package db_storm
 
 import (
+	"io/ioutil"
+	"os"
 	"testing"
 
+	"github.com/cloudsonic/sonic-server/conf"
 	"github.com/cloudsonic/sonic-server/domain"
+	"github.com/cloudsonic/sonic-server/log"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
 func TestStormPersistence(t *testing.T) {
-	//log.SetLevel(log.LevelCritical)
+	log.SetLevel(log.LevelCritical)
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Storm Persistence Suite")
 }
@@ -27,6 +31,8 @@ var testArtists = domain.Artists{
 
 var _ = Describe("Initialize test DB", func() {
 	BeforeSuite(func() {
+		conf.Sonic.DbPath, _ = ioutil.TempDir("", "cloudsonic_tests")
+		os.MkdirAll(conf.Sonic.DbPath, 0700)
 		Db().Drop(&_Album{})
 		albumRepo := NewAlbumRepository()
 		for _, a := range testAlbums {