diff --git a/rust-toolchain b/rust-toolchain
index d0654ca157b..b7d71e79b1b 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2021-05-01"
+channel = "nightly-2021-05-04"
 components = ["rustc-dev"]
diff --git a/tests/source/match.rs b/tests/source/match.rs
index f54082f92eb..da20517203a 100644
--- a/tests/source/match.rs
+++ b/tests/source/match.rs
@@ -410,7 +410,7 @@ fn match_with_near_max_width() {
 
 fn match_with_trailing_spaces() {
     match x {    
-        #![allow(simple_match)]
+        
         Some(..) => 0,
         None => 1,
     }
diff --git a/tests/target/issue-3592.rs b/tests/target/issue-3592.rs
deleted file mode 100644
index 3142268e081..00000000000
--- a/tests/target/issue-3592.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-fn r() -> (Biz, ()) {
-    (
-        Biz {
-            #![cfg(unix)]
-            field: 9
-        },
-        Biz {
-            #![cfg(not(unix))]
-            field: 200
-        },
-        (),
-    )
-}
diff --git a/tests/target/match.rs b/tests/target/match.rs
index 123c4c55f6a..e2c522bea10 100644
--- a/tests/target/match.rs
+++ b/tests/target/match.rs
@@ -441,7 +441,6 @@ fn match_with_near_max_width() {
 
 fn match_with_trailing_spaces() {
     match x {
-        #![allow(simple_match)]
         Some(..) => 0,
         None => 1,
     }