diff --git a/Makefile b/Makefile
index efa44fb..12d1b20 100644
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,16 @@ VERSION = 0.9.1
 all: build
 
 build:
-	docker.io build -t $(NAME):$(VERSION) --rm .
+	docker build -t $(NAME):$(VERSION) --rm .
 
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) ./test.sh debug
 
 tag_latest:
-	docker.io tag $(NAME):$(VERSION) $(NAME):latest
+	docker tag $(NAME):$(VERSION) $(NAME):latest
 
 release: build test tag_latest
-	@if ! docker.io images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	docker.io push $(NAME)
+	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	docker push $(NAME)
 	@echo "*** Don't forget to run 'twgit release finish' :)"
 
diff --git a/test/tools/build-container.sh b/test/tools/build-container.sh
index 7103b87..2be4907 100755
--- a/test/tools/build-container.sh
+++ b/test/tools/build-container.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-docker.io build -t $testImage .
-#docker.io build --no-cache=true -t $testImage .
+docker build -t $testImage .
+#docker build --no-cache=true -t $testImage .
 
diff --git a/test/tools/delete-container.sh b/test/tools/delete-container.sh
index dc33aae..e7a6abe 100755
--- a/test/tools/delete-container.sh
+++ b/test/tools/delete-container.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # remove test container
-res=$(docker.io ps -a | grep -c "$testContainer")
+res=$(docker ps -a | grep -c "$testContainer")
 
 if [ $res -ne 0 ]; then
-  docker.io stop $testContainer
-  docker.io rm $testContainer
+  docker stop $testContainer
+  docker rm $testContainer
 fi
diff --git a/test/tools/delete-image.sh b/test/tools/delete-image.sh
index 9704547..28cd3d2 100755
--- a/test/tools/delete-image.sh
+++ b/test/tools/delete-image.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # remove test image
-res=$(docker.io images | grep -c "$testImage")
+res=$(docker images | grep -c "$testImage")
 
 if [ $res -ne 0 ]; then
-  docker.io rmi $testImage
+  docker rmi $testImage
 fi
diff --git a/test/tools/run-container.sh b/test/tools/run-container.sh
index 2c0e1d7..d6825ae 100755
--- a/test/tools/run-container.sh
+++ b/test/tools/run-container.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-echo "docker.io run --name $testContainer $runOptions -d $testImage $runCommand"
-ID=`docker.io run --name $testContainer $runOptions -d $testImage $runCommand`
+echo "docker run --name $testContainer $runOptions -d $testImage $runCommand"
+ID=`docker run --name $testContainer $runOptions -d $testImage $runCommand`
 sleep 10
 
 echo " --> Obtaining IP"
-IP=`docker.io inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
+IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
 if [ "$IP" = "" ]; then
 	abort "Unable to obtain container IP"
 	exit 1