diff --git a/Makefile b/Makefile
index 0f35b82..a9cbd47 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: build push test
 
-TAG:=6
+TAG:=7
 
 build:
 	docker build -t testbed/vim:$(TAG) .
diff --git a/README.md b/README.md
index a7785c4..867fcff 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ docker run -it --rm -v $PWD:/testplugin -v $PWD/test:/home "your/repository" vim
 The entry point for the container is a script that runs the named Vim version.
 In this case `vim74`.  Arguments after the name is passed to Vim.
 
-The entry point script prefixes your arguments with `-u /home/vimrc -i NONE`.
+The entry point script prefixes your arguments with `-u /home/vimtest/vimrc -i NONE`.
 They can be overridden with your arguments.
 
 ## Setup
@@ -97,8 +97,8 @@ vimrc:
 source /rtp.vim
 ```
 
-It will add `/home/vim` and `/home/vim/after` to the runtime path, and search
-for plugins in `/home/plugins`.
+It will add `/home/vimtest/vim` and `/home/vimtest/vim/after` to the runtime
+path, and search for plugins in `/home/vimtest/plugins`.
 
 ### Volumes
 
diff --git a/example/Makefile b/example/Makefile
index 525ed94..dfb6b52 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -9,8 +9,8 @@ WRITABLE_HOME:=$(shell tmpdir=$$(mktemp -d --dry-run); \
 	echo $${tmpdir})
 DOCKER = docker run -a stderr --rm \
 	-v $(CURDIR):/testplugin \
-	-v $(WRITABLE_HOME):/home \
-	-v $(CURDIR)/$(PLUGINS):/home/plugins "$(IMAGE)"
+	-v $(WRITABLE_HOME):/home/vimtest \
+	-v $(CURDIR)/$(PLUGINS):/home/vimtest/plugins "$(IMAGE)"
 
 test: test-setup
 	docker build -f Dockerfile.tests -t "$(IMAGE)" .
@@ -29,8 +29,8 @@ test: test-setup
 	fi; \
 	for vim in "neovim-master --headless" vim-master; do \
 	  $(DOCKER) $${vim} -u NONE \
-	    "+py  import sys; open('/home/py2', 'w').write(str(sys.version_info[0]))" \
-	    "+py3 import sys; open('/home/py3', 'w').write(str(sys.version_info[0]))" \
+	    "+py  import sys; open('/home/vimtest/py2', 'w').write(str(sys.version_info[0]))" \
+	    "+py3 import sys; open('/home/vimtest/py3', 'w').write(str(sys.version_info[0]))" \
 	    '+q'; \
 	  if [ "$$(<$(WRITABLE_HOME)/py2)" != "2" ]; then \
 	    echo "Failed to get Python version from $${vim} (2)." >&2; exit 1; \
@@ -42,7 +42,7 @@ test: test-setup
 	done; \
 	for vim in "neovim-master --headless" vim-master; do \
 	  $(DOCKER) $${vim} -u NONE \
-	    "+ruby open('/home/ruby', 'w') { |f| f << 'ruby was here' }" \
+	    "+ruby open('/home/vimtest/ruby', 'w') { |f| f << 'ruby was here' }" \
 	    '+q'; \
 	  if [ "$$(<$(WRITABLE_HOME)/ruby)" != "ruby was here" ]; then \
 	    echo "Failed to get output from Ruby for $${vim}." >&2; exit 1; \
@@ -51,7 +51,7 @@ test: test-setup
 	done; \
 	for vim in "neovim-master --headless" vim-master; do \
 	  $(DOCKER) $${vim} -u NONE \
-	  "+lua io.open('/home/lua', 'w'):write('lua was here')" \
+	  "+lua io.open('/home/vimtest/lua', 'w'):write('lua was here')" \
 	  '+q'; \
 	  if [ "$$(<$(WRITABLE_HOME)/lua)" != "lua was here" ]; then \
 	    echo "Failed to get output from Lua for $${vim}." >&2; exit 1; \
diff --git a/scripts/rtp.vim b/scripts/rtp.vim
index d0b1a6c..b831ae1 100644
--- a/scripts/rtp.vim
+++ b/scripts/rtp.vim
@@ -1,3 +1,3 @@
-set rtp=/home/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,/home/vim/after
-execute 'set rtp+='.join(filter(split(expand('/home/plugins/*')), 'isdirectory(v:val)'), ',')
+set rtp=/home/vimtest/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,/home/vimtest/vim/after
+execute 'set rtp+='.join(filter(split(expand('/home/vimtest/plugins/*')), 'isdirectory(v:val)'), ',')
 set rtp+=/testplugin
diff --git a/scripts/run_vim.sh b/scripts/run_vim.sh
index e1d664a..9bc0ac4 100644
--- a/scripts/run_vim.sh
+++ b/scripts/run_vim.sh
@@ -11,7 +11,7 @@ if ! [ -x "/vim-build/bin/$BIN" ]; then
 fi
 
 # Set default vimrc to a visible file
-ARGS="-u /home/vimrc -i NONE"
+ARGS="-u /home/vimtest/vimrc -i NONE"
 
 # So we can pass the arguments to Vim as it was passed to this script
 while [ $# -gt 0 ]; do