diff --git a/Makefile b/Makefile
index 8c5f84fd9..c1a173c07 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BASE_DIR = $(shell pwd)
 REBAR    = $(BASE_DIR)/rebar
 DIST	 = $(BASE_DIR)/rel/$(APP)
 
-all: submods compile
+all: compile
 
 submods:
 	@git submodule update --init
@@ -26,7 +26,7 @@ clean:
 	@$(REBAR) clean
 
 test:
-	ERL_FLAGS="-config rel/files/test.config" $(REBAR) -v skip_deps=true ct
+	ERL_FLAGS="-config rel/files/emqttd.test.config" $(REBAR) -v skip_deps=true ct
 	#$(REBAR) skip_deps=true eunit
 
 edoc:
diff --git a/rebar.config b/rebar.config
index 695b2dd0d..fc6762faf 100644
--- a/rebar.config
+++ b/rebar.config
@@ -23,7 +23,7 @@
 
 {ct_log_dir, "logs"}.
 
-{ct_extra_params, "-name ct_emqttd@127.0.0.1 -config rel/files/test.config"}.
+{ct_extra_params, "-name ct_emqttd@127.0.0.1 -config rel/files/emqttd.test.config"}.
 
 {ct_use_short_names, false}.