diff --git a/mk/tests.mk b/mk/tests.mk
index 6ea2d9cbe8e..1989d6ef867 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -376,7 +376,8 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)):				\
 	@$$(call E, rustc: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test	\
 		-L "$$(RT_OUTPUT_DIR_$(2))"		\
-		-L "$$(LLVM_LIBDIR_$(2))"
+		-L "$$(LLVM_LIBDIR_$(2))"		\
+		$$(RUSTFLAGS_$(4))
 
 endef
 
diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs
index c87b7ec76ee..73b92e5b868 100644
--- a/src/librustc/middle/typeck/check/mod.rs
+++ b/src/librustc/middle/typeck/check/mod.rs
@@ -2365,7 +2365,8 @@ fn check_expr_with_unifier(fcx: &FnCtxt,
                     ty::ty_struct(base_id, ref substs) => {
                         debug!("struct named {}", ppaux::ty_to_str(tcx, base_t));
                         let fields = ty::lookup_struct_fields(tcx, base_id);
-                        lookup_field_ty(tcx, base_id, fields.as_slice(), field.node.name, &(*substs))
+                        lookup_field_ty(tcx, base_id, fields.as_slice(),
+                                        field.node.name, &(*substs))
                     }
                     _ => None
                 }