diff --git a/rally/db/sqlalchemy/models.py b/rally/db/sqlalchemy/models.py
index a621790a36..f8344772c2 100644
--- a/rally/db/sqlalchemy/models.py
+++ b/rally/db/sqlalchemy/models.py
@@ -53,7 +53,6 @@ class Task(BASE, RallyBase):
 
 
 def create_db():
-    drop_db()
     BASE.metadata.create_all(session.get_engine())
 
 
diff --git a/rally/test.py b/rally/test.py
index 23063c1e4a..7dbe5f08ba 100644
--- a/rally/test.py
+++ b/rally/test.py
@@ -27,6 +27,7 @@ class DatabaseFixture(config.Config):
         super(DatabaseFixture, self).setUp()
         db.db_cleanup()
         self.conf.set_default('connection', "sqlite://", group='database')
+        db.db_drop()
         db.db_create()