diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs
index 1a22ed03a452..9b3c9d29cc74 100644
--- a/src/libstd/num/int_macros.rs
+++ b/src/libstd/num/int_macros.rs
@@ -59,6 +59,8 @@ impl FromStrRadix for $T {
 /// # Examples
 ///
 /// ```
+/// #![allow(deprecated)]
+///
 /// std::int::to_str_bytes(123, 10, |v| {
 ///     assert!(v == "123".as_bytes());
 /// });
diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs
index 3b456caa0996..19e45b292fbb 100644
--- a/src/libstd/num/uint_macros.rs
+++ b/src/libstd/num/uint_macros.rs
@@ -60,6 +60,8 @@ impl FromStrRadix for $T {
 /// # Examples
 ///
 /// ```
+/// #![allow(deprecated)]
+///
 /// std::uint::to_str_bytes(123, 10, |v| {
 ///     assert!(v == "123".as_bytes());
 /// });
diff --git a/src/test/compile-fail/repeat_count.rs b/src/test/compile-fail/repeat_count.rs
index 6d8655fd7d45..c62685d0088f 100644
--- a/src/test/compile-fail/repeat_count.rs
+++ b/src/test/compile-fail/repeat_count.rs
@@ -14,9 +14,13 @@ fn main() {
     let n = 1;
     let a = [0, ..n]; //~ ERROR expected constant integer for repeat count but found variable
     let b = [0, ..()]; //~ ERROR expected positive integer for repeat count but found ()
+    //~^ ERROR: expected `uint` but found `()`
     let c = [0, ..true]; //~ ERROR expected positive integer for repeat count but found boolean
+    //~^ ERROR: expected `uint` but found `bool`
     let d = [0, ..0.5]; //~ ERROR expected positive integer for repeat count but found float
+    //~^ ERROR: expected `uint` but found `<generic float #0>`
     let e = [0, .."foo"]; //~ ERROR expected positive integer for repeat count but found string
+    //~^ ERROR: expected `uint` but found `&'static str`
     let f = [0, ..-4];
     //~^ ERROR expected positive integer for repeat count but found negative integer
 }
diff --git a/src/test/debuginfo/generic-function.rs b/src/test/debuginfo/generic-function.rs
index 9fe17f9937ab..1777c168d9b9 100644
--- a/src/test/debuginfo/generic-function.rs
+++ b/src/test/debuginfo/generic-function.rs
@@ -55,9 +55,9 @@ fn dup_tup<T0: Clone, T1: Clone>(t0: &T0, t1: &T1) -> ((T0, T1), (T1, T0)) {
 
 fn main() {
 
-    let _ = dup_tup(&1, &2.5);
-    let _ = dup_tup(&3.5, &4_u16);
-    let _ = dup_tup(&5, &Struct { a: 6, b: 7.5 });
+    let _ = dup_tup(&1i, &2.5f64);
+    let _ = dup_tup(&3.5f64, &4_u16);
+    let _ = dup_tup(&5i, &Struct { a: 6, b: 7.5 });
 }
 
 fn zzz() {()}
diff --git a/src/test/debuginfo/generic-functions-nested.rs b/src/test/debuginfo/generic-functions-nested.rs
index 1849ca161380..d9b20a84cddf 100644
--- a/src/test/debuginfo/generic-functions-nested.rs
+++ b/src/test/debuginfo/generic-functions-nested.rs
@@ -52,8 +52,8 @@ fn outer<TA: Clone>(a: TA) {
 }
 
 fn main() {
-    outer(-1);
-    outer(-2.5);
+    outer(-1i);
+    outer(-2.5f64);
 }
 
 fn zzz() {()}
diff --git a/src/test/run-pass/issue-15108.rs b/src/test/run-pass/issue-15108.rs
index 736bd6cd3ab2..8ae3d072362e 100644
--- a/src/test/run-pass/issue-15108.rs
+++ b/src/test/run-pass/issue-15108.rs
@@ -8,6 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// compile-flags:-O
-
 fn main() {}