diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs
index 5320389db9a..8b92cabd30e 100644
--- a/src/comp/middle/resolve.rs
+++ b/src/comp/middle/resolve.rs
@@ -382,6 +382,8 @@ fn lookup_name_wrapped(&env e, ast.ident i, namespace ns, direction dir)
                     case (ast.mie_item(?item)) {
                         if (visible(i, m, dir)) {
                             ret some(found_def_item(item, ns));
+                        } else {
+                            ret none[def_wrap];
                         }
                     }
                     case (ast.mie_tag_variant(?item, ?variant_idx)) {
@@ -391,6 +393,8 @@ fn lookup_name_wrapped(&env e, ast.ident i, namespace ns, direction dir)
                                     auto vid = variants.(variant_idx).node.id;
                                     auto t = ast.def_variant(tid, vid);
                                     ret some[def_wrap](def_wrap_other(t));
+                                } else {
+                                    ret none[def_wrap];
                                 }
                             }
                             case (_) {
diff --git a/src/test/compile-fail/export-fully-qualified.rs b/src/test/compile-fail/export-fully-qualified.rs
index 005f17f26ee..282257545e1 100644
--- a/src/test/compile-fail/export-fully-qualified.rs
+++ b/src/test/compile-fail/export-fully-qualified.rs
@@ -1,7 +1,5 @@
 // xfail-boot
 // xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: unresolved name
 
 // In this test baz isn't resolved when called as foo.baz even though
diff --git a/src/test/compile-fail/export-import.rs b/src/test/compile-fail/export-import.rs
index def6af8e9c5..6cc053d1a2e 100644
--- a/src/test/compile-fail/export-import.rs
+++ b/src/test/compile-fail/export-import.rs
@@ -1,7 +1,5 @@
 // xfail-boot
 // xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: unresolved name
 
 import m.unexported;
diff --git a/src/test/compile-fail/export-no-tag-variants.rs b/src/test/compile-fail/export-no-tag-variants.rs
index 11100b98b54..b812859c80a 100644
--- a/src/test/compile-fail/export-no-tag-variants.rs
+++ b/src/test/compile-fail/export-no-tag-variants.rs
@@ -1,7 +1,5 @@
 // xfail-boot
 // xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: unresolved name
 
 // Tag variants are not exported with their tags. This allows for a
diff --git a/src/test/compile-fail/export-tag-variant.rs b/src/test/compile-fail/export-tag-variant.rs
index dee8a48339b..1de937e25cd 100644
--- a/src/test/compile-fail/export-tag-variant.rs
+++ b/src/test/compile-fail/export-tag-variant.rs
@@ -1,7 +1,5 @@
 // xfail-boot
 // xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: unresolved name
 
 mod foo {
diff --git a/src/test/compile-fail/export.rs b/src/test/compile-fail/export.rs
index 337dcaec792..8b491542a92 100644
--- a/src/test/compile-fail/export.rs
+++ b/src/test/compile-fail/export.rs
@@ -1,7 +1,5 @@
 // xfail-boot
 // xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: unresolved name
 mod foo {
   export x;
diff --git a/src/test/compile-fail/export2.rs b/src/test/compile-fail/export2.rs
index 5ccdc90ffb5..435ffb904d9 100644
--- a/src/test/compile-fail/export2.rs
+++ b/src/test/compile-fail/export2.rs
@@ -1,7 +1,5 @@
 // xfail-boot
 // xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: unresolved name
 
 mod foo {