Merge branch 'master' into rel_1_1

1 files changed, 2 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 2f5c3178c..da45c09d6 100644
--- a/setup.py
+++ b/setup.py
@@ -93,10 +93,10 @@ class PyTest(TestCommand):
         self.test_suite = True
 
     def run_tests(self):
+        import shlex
         # import here, cause outside the eggs aren't loaded
         import pytest
-        errno = pytest.main(
-            " ".join(self.default_options) + " " + self.pytest_args)
+        errno = pytest.main(self.default_options + shlex.split(self.pytest_args))
         sys.exit(errno)
 
 cmdclass['test'] = PyTest