diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py
index 116cb2d2ff..9d9f39e87d 100644
--- a/lib/spack/spack/test/multimethod.py
+++ b/lib/spack/spack/test/multimethod.py
@@ -95,7 +95,6 @@ def test_target_match(self):
         platform = spack.architecture.sys_type()
         targets = platform.targets.values()
         for target in targets[:-1]:
-            print target
             pkg = spack.db.get('multimethod='+target.name)
             self.assertEqual(pkg.different_by_target(), target.name)
 
diff --git a/var/spack/mock_packages/multimethod/package.py b/var/spack/mock_packages/multimethod/package.py
index 4e9a2438a7..b37db9f1eb 100644
--- a/var/spack/mock_packages/multimethod/package.py
+++ b/var/spack/mock_packages/multimethod/package.py
@@ -114,8 +114,10 @@ def has_a_default(self):
 #        platform = cls()
     platform = spack.architecture.sys_type()
     targets = platform.targets.values()
+    if len(targets) > 1:
+        targets = targets[:-1]
     
-    for target in targets[:-1]:
+    for target in targets:
         @when('='+target.name)
         def different_by_target(self):
             return self.spec.target.name