diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py
index c651b7ad4a6..116cb2d2ffe 100644
--- a/lib/spack/spack/test/multimethod.py
+++ b/lib/spack/spack/test/multimethod.py
@@ -100,7 +100,11 @@ def test_target_match(self):
             self.assertEqual(pkg.different_by_target(), target.name)
 
         pkg = spack.db.get('multimethod='+targets[-1].name)
-        self.assertRaises(NoSuchMethodError, pkg.different_by_target)
+        if len(targets) == 1:
+            self.assertEqual(pkg.different_by_target(), targets[-1].name)
+        else:
+            self.assertRaises(NoSuchMethodError, pkg.different_by_target)
+
 
     def test_dependency_match(self):
         pkg = spack.db.get('multimethod^zmpi')
diff --git a/var/spack/mock_packages/multimethod/package.py b/var/spack/mock_packages/multimethod/package.py
index 0a1e991d37e..4e9a2438a7a 100644
--- a/var/spack/mock_packages/multimethod/package.py
+++ b/var/spack/mock_packages/multimethod/package.py
@@ -22,6 +22,9 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
+import imp
+from llnl.util.filesystem import join_path
+from spack.util.naming import mod_to_class
 from spack import *
 import spack.architecture
 
@@ -103,8 +106,15 @@ def has_a_default(self):
     #
     # Make sure we can switch methods on different target
     #
+#    for platform_name in ['cray_xc', 'darwin', 'linux']:
+#        file_path = join_path(spack.platform_path, platform_name)
+#        platform_mod = imp.load_source('spack.platforms', file_path + '.py')
+#        cls = getattr(platform_mod, mod_to_class(platform_name))
+        
+#        platform = cls()
     platform = spack.architecture.sys_type()
     targets = platform.targets.values()
+    
     for target in targets[:-1]:
         @when('='+target.name)
         def different_by_target(self):