diff --git a/tests/functional/test_bash.py b/tests/functional/test_bash.py
index 52d21d6e..674556b4 100644
--- a/tests/functional/test_bash.py
+++ b/tests/functional/test_bash.py
@@ -2,7 +2,7 @@ import pytest
 from tests.functional.plots import with_confirmation, without_confirmation
 from tests.functional.utils import spawn, functional
 
-containers = [('thefuck/ubuntu-python3-bash', '''
+containers = [('ubuntu-python3-bash', '''
 FROM ubuntu:latest
 RUN apt-get update
 RUN apt-get install -yy python3 python3-pip python3-dev
@@ -10,7 +10,7 @@ RUN pip3 install -U setuptools
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
 CMD ["/bin/bash"]
 '''),
-              ('thefuck/ubuntu-python2-bash', '''
+              ('ubuntu-python2-bash', '''
 FROM ubuntu:latest
 RUN apt-get update
 RUN apt-get install -yy python python-pip python-dev
diff --git a/tests/functional/test_fish.py b/tests/functional/test_fish.py
index 933ec05f..cc47d2f6 100644
--- a/tests/functional/test_fish.py
+++ b/tests/functional/test_fish.py
@@ -2,7 +2,7 @@ import pytest
 from tests.functional.plots import with_confirmation, without_confirmation
 from tests.functional.utils import spawn, functional
 
-containers = [('thefuck/ubuntu-python3-bash', '''
+containers = [('ubuntu-python3-bash', '''
 FROM ubuntu:latest
 RUN apt-get update
 RUN apt-get install -yy python3 python3-pip python3-dev fish
@@ -10,7 +10,7 @@ RUN pip3 install -U setuptools
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
 CMD ["/usr/bin/fish"]
 '''),
-              ('thefuck/ubuntu-python2-bash', '''
+              ('ubuntu-python2-bash', '''
 FROM ubuntu:latest
 RUN apt-get update
 RUN apt-get install -yy python python-pip python-dev fish
diff --git a/tests/functional/test_zsh.py b/tests/functional/test_zsh.py
index 1913d9e5..fde4818f 100644
--- a/tests/functional/test_zsh.py
+++ b/tests/functional/test_zsh.py
@@ -2,7 +2,7 @@ import pytest
 from tests.functional.utils import spawn, functional
 from tests.functional.plots import with_confirmation, without_confirmation
 
-containers = [('thefuck/ubuntu-python3-zsh', '''
+containers = [('ubuntu-python3-zsh', '''
 FROM ubuntu:latest
 RUN apt-get update
 RUN apt-get install -yy python3 python3-pip python3-dev zsh
@@ -10,7 +10,7 @@ RUN pip3 install -U setuptools
 RUN ln -s /usr/bin/pip3 /usr/bin/pip
 CMD ["/bin/zsh"]
 '''),
-              ('thefuck/ubuntu-python2-zsh', '''
+              ('ubuntu-python2-zsh', '''
 FROM ubuntu:latest
 RUN apt-get update
 RUN apt-get install -yy python python-pip python-dev zsh
diff --git a/tests/functional/utils.py b/tests/functional/utils.py
index f29f5808..3b4e18c6 100644
--- a/tests/functional/utils.py
+++ b/tests/functional/utils.py
@@ -17,12 +17,13 @@ def build_container(tag, dockerfile):
         file.write(dockerfile)
     if subprocess.call(['docker', 'build', '--tag={}'.format(tag), tmpdir],
                        cwd=root) != 0:
-        raise Exception("Can't build container")
+        raise Exception("Can't build a container")
     shutil.rmtree(tmpdir)
 
 
 @contextmanager
 def spawn(tag, dockerfile):
+    tag = 'thefuck/{}'.format(tag)
     build_container(tag, dockerfile)
     proc = pexpect.spawnu(
         'docker run --volume {}:/src --tty=true --interactive=true {}'.format(root, tag))