diff --git a/Makefile b/Makefile
index ecbae6881f..39e24cd494 100644
--- a/Makefile
+++ b/Makefile
@@ -137,9 +137,9 @@ test-full: vet lint
 	@echo
 	go test -tags "${NOTARY_BUILDTAGS}" $(TESTOPTS) -v $(PKGS)
 
+integration: TESTDB = mysql
 integration:
-	buildscripts/integrationtest.sh development.yml
-	buildscripts/integrationtest.sh development.rethink.yml
+	buildscripts/integrationtest.sh development.$(TESTDB).yml
 
 protos:
 	@protoc --go_out=plugins=grpc:. proto/*.proto
diff --git a/circle.yml b/circle.yml
index 481182bc39..143ad0270d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -75,7 +75,7 @@ test:
   override:
   # Test stable, and report
   # hacking this to be parallel
-    - case $CIRCLE_NODE_INDEX in 0) gvm use stable && NOTARY_BUILDTAGS=pkcs11 make ci ;; 1) gvm use stable && NOTARY_BUILDTAGS=none make ci ;; 2) gvm use stable && make integration ;; esac:
+    - case $CIRCLE_NODE_INDEX in 0) gvm use stable && NOTARY_BUILDTAGS=pkcs11 make ci ;; 1) gvm use stable && NOTARY_BUILDTAGS=none make ci ;; 2) gvm use stable && make TESTDB=mysql integration ;; 3) gvm use stable && make TESTDB=rethink integration ;; esac:
         parallel: true
         timeout: 600
         pwd: $BASE_STABLE
diff --git a/development.yml b/development.mysql.yml
similarity index 100%
rename from development.yml
rename to development.mysql.yml