diff --git a/setup.py b/setup.py
index 7f2525d..d50591a 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@ setup(
 
     install_requires = ['pyyaml', 'bibtexparser', 'python-dateutil', 'requests', 'configobj',
                         'beautifulsoup4'], # to be made optional?
+    tests_require = ['pyfakefs>=2.7'],
 
     classifiers=[
         'Development Status :: 4 - Beta',
diff --git a/tests/fake_env.py b/tests/fake_env.py
index fd627c2..ef3db67 100644
--- a/tests/fake_env.py
+++ b/tests/fake_env.py
@@ -6,9 +6,8 @@ import glob
 import unittest
 
 import dotdot
-import fake_filesystem
-import fake_filesystem_shutil
-import fake_filesystem_glob
+from pyfakefs import (fake_filesystem, fake_filesystem_shutil,
+                      fake_filesystem_glob)
 
 from pubs.p3 import input, _fake_stdio, _get_fake_stdio_ucontent
 from pubs import content, filebroker