diff --git a/.travis.yml b/.travis.yml
index fbd0f1f1..19c568f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ install:
   - true
 
 script:
-  - make test-all
+  - make test
   # gover collects all .coverprofile files and saves it to one file gover.coverprofile
   - gover
   - goveralls -coverprofile=gover.coverprofile -service=travis-ci
diff --git a/Makefile b/Makefile
index 26e35bea..c166adcc 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,8 @@ check-vendor:
 	./script/check-vendor.sh
 
 # Run all tests
-.PHONY: test-all
-test-all: check-vendor validate test-unit-cover install test-cmd
+.PHONY: test
+test: check-vendor validate test-unit-cover install test-cmd
 
 # build docker image that is used for running all test localy
 .PHONY: test-image
@@ -91,8 +91,8 @@ test-image:
 	docker build -t $(TEST_IMAGE) -f script/test_in_container/Dockerfile script/test_in_container/
 	
 # run all test localy in docker image (image can be build by by build-test-image target)
-.PHONY: test
-test:
+.PHONY: test-container
+test-container:
 	docker run -v `pwd`:/opt/tmp/kompose:ro -it $(TEST_IMAGE) 
 
 
diff --git a/script/test_in_container/run.sh b/script/test_in_container/run.sh
index 892222b0..df2a3e97 100755
--- a/script/test_in_container/run.sh
+++ b/script/test_in_container/run.sh
@@ -22,4 +22,4 @@ set -e
 # We can be sure that this container won't modify any files on hosts disk.
 cp -r $KOMPOSE_TMP_SRC/ $(dirname $KOMPOSE_SRC)
 
-make test-all
+make test