diff --git a/src/libcharon/plugins/vici/python/MANIFEST.in b/src/libcharon/plugins/vici/python/MANIFEST.in
index 9d5d250d0..883ea5d52 100644
--- a/src/libcharon/plugins/vici/python/MANIFEST.in
+++ b/src/libcharon/plugins/vici/python/MANIFEST.in
@@ -1,2 +1,4 @@
 include LICENSE
 include README.rst
+include tox.ini
+recursive-include test *.py
diff --git a/src/libcharon/plugins/vici/python/Makefile.am b/src/libcharon/plugins/vici/python/Makefile.am
index 8a9e6fc26..a2e7596e4 100644
--- a/src/libcharon/plugins/vici/python/Makefile.am
+++ b/src/libcharon/plugins/vici/python/Makefile.am
@@ -2,8 +2,8 @@ EXTRA_DIST = LICENSE README.rst MANIFEST.in \
 	setup.py.in \
 	tox.ini \
 	tox.sh \
-	vici/test/__init__.py \
-	vici/test/test_protocol.py \
+	test/__init__.py \
+	test/test_protocol.py \
 	vici/__init__.py \
 	vici/command_wrappers.py \
 	vici/compat.py \
diff --git a/src/libcharon/plugins/vici/python/vici/test/__init__.py b/src/libcharon/plugins/vici/python/test/__init__.py
similarity index 100%
rename from src/libcharon/plugins/vici/python/vici/test/__init__.py
rename to src/libcharon/plugins/vici/python/test/__init__.py
diff --git a/src/libcharon/plugins/vici/python/vici/test/test_protocol.py b/src/libcharon/plugins/vici/python/test/test_protocol.py
similarity index 98%
rename from src/libcharon/plugins/vici/python/vici/test/test_protocol.py
rename to src/libcharon/plugins/vici/python/test/test_protocol.py
index 7ae1f2f90..1924884a1 100644
--- a/src/libcharon/plugins/vici/python/vici/test/test_protocol.py
+++ b/src/libcharon/plugins/vici/python/test/test_protocol.py
@@ -1,7 +1,7 @@
 import pytest
 
-from ..protocol import Packet, Message, FiniteStream
-from ..exception import DeserializationException
+from vici.protocol import Packet, Message, FiniteStream
+from vici.exception import DeserializationException
 
 
 class TestPacket(object):