diff --git a/.travis.yml b/.travis.yml
index 55a37d6..5bae0a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,12 @@ before_install:
 
 before_script:
   - make docker-start
-  - sleep 30s
+  - sleep 1m && sleep 30s
 
 script:
+  - make gen-certs
   - make apidoc
   - make test
-  - make gen-certs
   - make mysql-dump
 
 before_script:
diff --git a/Makefile b/Makefile
index ff11183..b0ee4fc 100644
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,11 @@ logs:
 
 mysql-dump:
 	@mkdir -p $(MYSQL_DUMPS_DIR)
-	@docker exec -i $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql
+	@docker exec $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql
 	@make resetOwner
 
 mysql-restore:
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql
+	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql
 
 test:
 	@docker exec -i $(shell docker-compose ps -q php) app/vendor/bin/phpunit --colors=always --configuration app/