Move value checking into its own block.

1 files changed, 5 insertions, 4 deletions

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index a80d91ad..4d859808 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -62,15 +62,16 @@ class test(Command):
 
     def finalize_options(self):
 
+        if self.test_suite and self.test_module:
+            raise DistutilsOptionError(
+                "You may specify a module or a suite, but not both"
+            )
+
         if self.test_suite is None:
             if self.test_module is None:
                 self.test_suite = self.distribution.test_suite
             else:
                 self.test_suite = self.test_module + ".test_suite"
-        elif self.test_module:
-            raise DistutilsOptionError(
-                "You may specify a module or a suite, but not both"
-            )
 
         if self.test_loader is None:
             self.test_loader = getattr(self.distribution, 'test_loader', None)