diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs
index 69ca77f54b44..aaeac06535ee 100644
--- a/src/libstd/f32.rs
+++ b/src/libstd/f32.rs
@@ -1777,22 +1777,4 @@ mod tests {
         assert_ne!(nan_masked & QNAN_MASK, 0);
         assert!(nan_masked_fl.is_nan());
     }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_min_greater_than_max() {
-        1.0f32.clamp(3.0, 1.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_min_is_nan() {
-        1.0f32.clamp(NAN, 1.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_max_is_nan() {
-        1.0f32.clamp(3.0, NAN);
-    }
 }
diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs
index 6ec633bfaaac..4ab319c3cf10 100644
--- a/src/libstd/f64.rs
+++ b/src/libstd/f64.rs
@@ -1668,22 +1668,4 @@ mod tests {
         assert_approx_eq!(f64::from_bits(0x4094e40000000000), 1337.0);
         assert_approx_eq!(f64::from_bits(0xc02c800000000000), -14.25);
     }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_min_greater_than_max() {
-        1.0f64.clamp(3.0, 1.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_min_is_nan() {
-        1.0f64.clamp(NAN, 1.0);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_clamp_max_is_nan() {
-        1.0f64.clamp(3.0, NAN);
-    }
 }
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 191f7fe648ed..cf1eb5cd52ea 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -249,7 +249,6 @@
 #![feature(cfg_target_vendor)]
 #![feature(char_error_internals)]
 #![feature(char_internals)]
-#![feature(clamp)]
 #![feature(collections_range)]
 #![feature(compiler_builtins_lib)]
 #![feature(const_fn)]