diff --git a/test/test_util.py b/test/test_util.py
index 2c6254c21..fc73407d8 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -6,7 +6,7 @@ from semantic_version import Version, Spec
 from util.validation import generate_valid_usernames
 from util.registry.generatorfile import GeneratorFile
 from util.registry.dockerver import docker_version
-from util.string import slash_join
+from util import slash_join
 
 class TestGeneratorFile(unittest.TestCase):
   def sample_generator(self):
diff --git a/util/validation.py b/util/validation.py
index 535c75f38..2dc49cff0 100644
--- a/util/validation.py
+++ b/util/validation.py
@@ -1,6 +1,8 @@
 import string
 import re
 
+import anunidecode # Don't listen to pylint's lies. This import is required.
+
 
 INVALID_PASSWORD_MESSAGE = 'Invalid password, password must be at least ' + \
                            '8 characters and contain no whitespace.'