diff --git a/tests/ui/indexing_slicing.rs b/tests/ui/indexing_slicing.rs
index f0bd39c02542..8dd6ae146251 100644
--- a/tests/ui/indexing_slicing.rs
+++ b/tests/ui/indexing_slicing.rs
@@ -1,5 +1,7 @@
 #![feature(plugin)]
 #![warn(clippy::indexing_slicing)]
+// We also check the out_of_bounds_indexing lint here, because it lints similar things and
+// we want to avoid false positives.
 #![warn(clippy::out_of_bounds_indexing)]
 #![allow(clippy::no_effect, clippy::unnecessary_operation)]
 
@@ -15,21 +17,10 @@ fn main() {
     &x[index_from..][..index_to]; // Two lint reports, one for [index_from..] and another for [..index_to].
     x[4]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
     x[1 << 3]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
-    &x[..=4];
-    &x[1..5];
-    &x[5..][..10]; // Two lint reports, one for [5..] and another for [..10].
-    &x[5..];
-    &x[..5];
-    &x[5..].iter().map(|x| 2 * x).collect::<Vec<i32>>();
-    &x[0..=4];
+    &x[5..][..10]; // Two lint reports, one for out of bounds [5..] and another for slicing [..10].
     &x[0..][..3];
     &x[1..][..5];
 
-    &x[4..]; // Ok, should not produce stderr.
-    &x[..4]; // Ok, should not produce stderr.
-    &x[..]; // Ok, should not produce stderr.
-    &x[1..]; // Ok, should not produce stderr.
-    &x[2..].iter().map(|x| 2 * x).collect::<Vec<i32>>(); // Ok, should not produce stderr.
     &x[0..].get(..3); // Ok, should not produce stderr.
     x[0]; // Ok, should not produce stderr.
     x[3]; // Ok, should not produce stderr.
@@ -43,21 +34,6 @@ fn main() {
 
     &y[..]; // Ok, should not produce stderr.
 
-    let empty: [i8; 0] = [];
-    empty[0]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
-    &empty[1..5];
-    &empty[0..=4];
-    &empty[..=4];
-    &empty[1..];
-    &empty[..4];
-    &empty[0..=0];
-    &empty[..=0];
-
-    &empty[0..]; // Ok, should not produce stderr.
-    &empty[0..0]; // Ok, should not produce stderr.
-    &empty[..0]; // Ok, should not produce stderr.
-    &empty[..]; // Ok, should not produce stderr.
-
     let v = vec![0; 5];
     v[0];
     v[10];
@@ -79,9 +55,4 @@ fn main() {
     x[M]; // Ok, should not produce stderr.
     v[N];
     v[M];
-
-    // issue 3102
-    let num = 1;
-    &x[num..10]; // should trigger out of bounds error
-    &x[10..num]; // should trigger out of bounds error
 }
diff --git a/tests/ui/indexing_slicing.stderr b/tests/ui/indexing_slicing.stderr
index 129fec0e97c1..f075de50686d 100644
--- a/tests/ui/indexing_slicing.stderr
+++ b/tests/ui/indexing_slicing.stderr
@@ -1,5 +1,5 @@
 error: index out of bounds: the len is 4 but the index is 4
-  --> $DIR/indexing_slicing.rs:16:5
+  --> $DIR/indexing_slicing.rs:18:5
    |
 LL |     x[4]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
    |     ^^^^
@@ -7,25 +7,19 @@ LL |     x[4]; // Ok, let rustc's `const_err` lint handle `usize` indexing on ar
    = note: #[deny(const_err)] on by default
 
 error: index out of bounds: the len is 4 but the index is 8
-  --> $DIR/indexing_slicing.rs:17:5
+  --> $DIR/indexing_slicing.rs:19:5
    |
 LL |     x[1 << 3]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
    |     ^^^^^^^^^
 
-error: index out of bounds: the len is 0 but the index is 0
-  --> $DIR/indexing_slicing.rs:47:5
-   |
-LL |     empty[0]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
-   |     ^^^^^^^^
-
 error: index out of bounds: the len is 4 but the index is 15
-  --> $DIR/indexing_slicing.rs:78:5
+  --> $DIR/indexing_slicing.rs:54:5
    |
 LL |     x[N]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
    |     ^^^^
 
 error: indexing may panic.
-  --> $DIR/indexing_slicing.rs:11:5
+  --> $DIR/indexing_slicing.rs:13:5
    |
 LL |     x[index];
    |     ^^^^^^^^
@@ -34,7 +28,7 @@ LL |     x[index];
    = help: Consider using `.get(n)` or `.get_mut(n)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:12:6
+  --> $DIR/indexing_slicing.rs:14:6
    |
 LL |     &x[index..];
    |      ^^^^^^^^^^
@@ -42,7 +36,7 @@ LL |     &x[index..];
    = help: Consider using `.get(n..)` or .get_mut(n..)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:13:6
+  --> $DIR/indexing_slicing.rs:15:6
    |
 LL |     &x[..index];
    |      ^^^^^^^^^^
@@ -50,7 +44,7 @@ LL |     &x[..index];
    = help: Consider using `.get(..n)`or `.get_mut(..n)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:14:6
+  --> $DIR/indexing_slicing.rs:16:6
    |
 LL |     &x[index_from..index_to];
    |      ^^^^^^^^^^^^^^^^^^^^^^^
@@ -58,7 +52,7 @@ LL |     &x[index_from..index_to];
    = help: Consider using `.get(n..m)` or `.get_mut(n..m)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:15:6
+  --> $DIR/indexing_slicing.rs:17:6
    |
 LL |     &x[index_from..][..index_to]; // Two lint reports, one for [index_from..] and another for [..index_to].
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -66,31 +60,17 @@ LL |     &x[index_from..][..index_to]; // Two lint reports, one for [index_from.
    = help: Consider using `.get(..n)`or `.get_mut(..n)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:15:6
+  --> $DIR/indexing_slicing.rs:17:6
    |
 LL |     &x[index_from..][..index_to]; // Two lint reports, one for [index_from..] and another for [..index_to].
    |      ^^^^^^^^^^^^^^^
    |
    = help: Consider using `.get(n..)` or .get_mut(n..)` instead
 
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:18:11
-   |
-LL |     &x[..=4];
-   |           ^
-   |
-   = note: `-D clippy::out-of-bounds-indexing` implied by `-D warnings`
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:19:11
-   |
-LL |     &x[1..5];
-   |           ^
-
 error: slicing may panic.
   --> $DIR/indexing_slicing.rs:20:6
    |
-LL |     &x[5..][..10]; // Two lint reports, one for [5..] and another for [..10].
+LL |     &x[5..][..10]; // Two lint reports, one for out of bounds [5..] and another for slicing [..10].
    |      ^^^^^^^^^^^^
    |
    = help: Consider using `.get(..n)`or `.get_mut(..n)` instead
@@ -98,35 +78,13 @@ LL |     &x[5..][..10]; // Two lint reports, one for [5..] and another for [..10
 error: range is out of bounds
   --> $DIR/indexing_slicing.rs:20:8
    |
-LL |     &x[5..][..10]; // Two lint reports, one for [5..] and another for [..10].
+LL |     &x[5..][..10]; // Two lint reports, one for out of bounds [5..] and another for slicing [..10].
    |        ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:21:8
    |
-LL |     &x[5..];
-   |        ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:22:10
-   |
-LL |     &x[..5];
-   |          ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:23:8
-   |
-LL |     &x[5..].iter().map(|x| 2 * x).collect::<Vec<i32>>();
-   |        ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:24:12
-   |
-LL |     &x[0..=4];
-   |            ^
+   = note: `-D clippy::out-of-bounds-indexing` implied by `-D warnings`
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:25:6
+  --> $DIR/indexing_slicing.rs:21:6
    |
 LL |     &x[0..][..3];
    |      ^^^^^^^^^^^
@@ -134,7 +92,7 @@ LL |     &x[0..][..3];
    = help: Consider using `.get(..n)`or `.get_mut(..n)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:26:6
+  --> $DIR/indexing_slicing.rs:22:6
    |
 LL |     &x[1..][..5];
    |      ^^^^^^^^^^^
@@ -142,7 +100,7 @@ LL |     &x[1..][..5];
    = help: Consider using `.get(..n)`or `.get_mut(..n)` instead
 
 error: indexing may panic.
-  --> $DIR/indexing_slicing.rs:39:5
+  --> $DIR/indexing_slicing.rs:30:5
    |
 LL |     y[0];
    |     ^^^^
@@ -150,7 +108,7 @@ LL |     y[0];
    = help: Consider using `.get(n)` or `.get_mut(n)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:40:6
+  --> $DIR/indexing_slicing.rs:31:6
    |
 LL |     &y[1..2];
    |      ^^^^^^^
@@ -158,7 +116,7 @@ LL |     &y[1..2];
    = help: Consider using `.get(n..m)` or `.get_mut(n..m)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:41:6
+  --> $DIR/indexing_slicing.rs:32:6
    |
 LL |     &y[0..=4];
    |      ^^^^^^^^
@@ -166,57 +124,15 @@ LL |     &y[0..=4];
    = help: Consider using `.get(n..m)` or `.get_mut(n..m)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:42:6
+  --> $DIR/indexing_slicing.rs:33:6
    |
 LL |     &y[..=4];
    |      ^^^^^^^
    |
    = help: Consider using `.get(..n)`or `.get_mut(..n)` instead
 
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:48:12
-   |
-LL |     &empty[1..5];
-   |            ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:49:16
-   |
-LL |     &empty[0..=4];
-   |                ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:50:15
-   |
-LL |     &empty[..=4];
-   |               ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:51:12
-   |
-LL |     &empty[1..];
-   |            ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:52:14
-   |
-LL |     &empty[..4];
-   |              ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:53:16
-   |
-LL |     &empty[0..=0];
-   |                ^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:54:15
-   |
-LL |     &empty[..=0];
-   |               ^
-
 error: indexing may panic.
-  --> $DIR/indexing_slicing.rs:62:5
+  --> $DIR/indexing_slicing.rs:38:5
    |
 LL |     v[0];
    |     ^^^^
@@ -224,7 +140,7 @@ LL |     v[0];
    = help: Consider using `.get(n)` or `.get_mut(n)` instead
 
 error: indexing may panic.
-  --> $DIR/indexing_slicing.rs:63:5
+  --> $DIR/indexing_slicing.rs:39:5
    |
 LL |     v[10];
    |     ^^^^^
@@ -232,7 +148,7 @@ LL |     v[10];
    = help: Consider using `.get(n)` or `.get_mut(n)` instead
 
 error: indexing may panic.
-  --> $DIR/indexing_slicing.rs:64:5
+  --> $DIR/indexing_slicing.rs:40:5
    |
 LL |     v[1 << 3];
    |     ^^^^^^^^^
@@ -240,7 +156,7 @@ LL |     v[1 << 3];
    = help: Consider using `.get(n)` or `.get_mut(n)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:65:6
+  --> $DIR/indexing_slicing.rs:41:6
    |
 LL |     &v[10..100];
    |      ^^^^^^^^^^
@@ -248,7 +164,7 @@ LL |     &v[10..100];
    = help: Consider using `.get(n..m)` or `.get_mut(n..m)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:66:6
+  --> $DIR/indexing_slicing.rs:42:6
    |
 LL |     &x[10..][..100]; // Two lint reports, one for [10..] and another for [..100].
    |      ^^^^^^^^^^^^^^
@@ -256,13 +172,13 @@ LL |     &x[10..][..100]; // Two lint reports, one for [10..] and another for [.
    = help: Consider using `.get(..n)`or `.get_mut(..n)` instead
 
 error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:66:8
+  --> $DIR/indexing_slicing.rs:42:8
    |
 LL |     &x[10..][..100]; // Two lint reports, one for [10..] and another for [..100].
    |        ^^
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:67:6
+  --> $DIR/indexing_slicing.rs:43:6
    |
 LL |     &v[10..];
    |      ^^^^^^^
@@ -270,7 +186,7 @@ LL |     &v[10..];
    = help: Consider using `.get(n..)` or .get_mut(n..)` instead
 
 error: slicing may panic.
-  --> $DIR/indexing_slicing.rs:68:6
+  --> $DIR/indexing_slicing.rs:44:6
    |
 LL |     &v[..100];
    |      ^^^^^^^^
@@ -278,7 +194,7 @@ LL |     &v[..100];
    = help: Consider using `.get(..n)`or `.get_mut(..n)` instead
 
 error: indexing may panic.
-  --> $DIR/indexing_slicing.rs:80:5
+  --> $DIR/indexing_slicing.rs:56:5
    |
 LL |     v[N];
    |     ^^^^
@@ -286,24 +202,12 @@ LL |     v[N];
    = help: Consider using `.get(n)` or `.get_mut(n)` instead
 
 error: indexing may panic.
-  --> $DIR/indexing_slicing.rs:81:5
+  --> $DIR/indexing_slicing.rs:57:5
    |
 LL |     v[M];
    |     ^^^^
    |
    = help: Consider using `.get(n)` or `.get_mut(n)` instead
 
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:85:13
-   |
-LL |     &x[num..10]; // should trigger out of bounds error
-   |             ^^
-
-error: range is out of bounds
-  --> $DIR/indexing_slicing.rs:86:8
-   |
-LL |     &x[10..num]; // should trigger out of bounds error
-   |        ^^
-
-error: aborting due to 43 previous errors
+error: aborting due to 27 previous errors
 
diff --git a/tests/ui/out_of_bounds_indexing/empty_array.rs b/tests/ui/out_of_bounds_indexing/empty_array.rs
new file mode 100644
index 000000000000..884e46eb4ee1
--- /dev/null
+++ b/tests/ui/out_of_bounds_indexing/empty_array.rs
@@ -0,0 +1,19 @@
+#![warn(clippy::out_of_bounds_indexing)]
+#![allow(clippy::no_effect, clippy::unnecessary_operation)]
+
+fn main() {
+    let empty: [i8; 0] = [];
+    empty[0];
+    &empty[1..5];
+    &empty[0..=4];
+    &empty[..=4];
+    &empty[1..];
+    &empty[..4];
+    &empty[0..=0];
+    &empty[..=0];
+
+    &empty[0..]; // Ok, should not produce stderr.
+    &empty[0..0]; // Ok, should not produce stderr.
+    &empty[..0]; // Ok, should not produce stderr.
+    &empty[..]; // Ok, should not produce stderr.
+}
diff --git a/tests/ui/out_of_bounds_indexing/empty_array.stderr b/tests/ui/out_of_bounds_indexing/empty_array.stderr
new file mode 100644
index 000000000000..2372bf860c52
--- /dev/null
+++ b/tests/ui/out_of_bounds_indexing/empty_array.stderr
@@ -0,0 +1,54 @@
+error: index out of bounds: the len is 0 but the index is 0
+  --> $DIR/empty_array.rs:6:5
+   |
+LL |     empty[0];
+   |     ^^^^^^^^
+   |
+   = note: #[deny(const_err)] on by default
+
+error: range is out of bounds
+  --> $DIR/empty_array.rs:7:12
+   |
+LL |     &empty[1..5];
+   |            ^
+   |
+   = note: `-D clippy::out-of-bounds-indexing` implied by `-D warnings`
+
+error: range is out of bounds
+  --> $DIR/empty_array.rs:8:16
+   |
+LL |     &empty[0..=4];
+   |                ^
+
+error: range is out of bounds
+  --> $DIR/empty_array.rs:9:15
+   |
+LL |     &empty[..=4];
+   |               ^
+
+error: range is out of bounds
+  --> $DIR/empty_array.rs:10:12
+   |
+LL |     &empty[1..];
+   |            ^
+
+error: range is out of bounds
+  --> $DIR/empty_array.rs:11:14
+   |
+LL |     &empty[..4];
+   |              ^
+
+error: range is out of bounds
+  --> $DIR/empty_array.rs:12:16
+   |
+LL |     &empty[0..=0];
+   |                ^
+
+error: range is out of bounds
+  --> $DIR/empty_array.rs:13:15
+   |
+LL |     &empty[..=0];
+   |               ^
+
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/out_of_bounds_indexing/issue-3102.rs b/tests/ui/out_of_bounds_indexing/issue-3102.rs
new file mode 100644
index 000000000000..edd2123d48a5
--- /dev/null
+++ b/tests/ui/out_of_bounds_indexing/issue-3102.rs
@@ -0,0 +1,11 @@
+#![warn(clippy::out_of_bounds_indexing)]
+#![allow(clippy::no_effect)]
+
+fn main() {
+    let x = [1, 2, 3, 4];
+
+    // issue 3102
+    let num = 1;
+    &x[num..10]; // should trigger out of bounds error
+    &x[10..num]; // should trigger out of bounds error
+}
diff --git a/tests/ui/out_of_bounds_indexing/issue-3102.stderr b/tests/ui/out_of_bounds_indexing/issue-3102.stderr
new file mode 100644
index 000000000000..516c1df40be0
--- /dev/null
+++ b/tests/ui/out_of_bounds_indexing/issue-3102.stderr
@@ -0,0 +1,16 @@
+error: range is out of bounds
+  --> $DIR/issue-3102.rs:9:13
+   |
+LL |     &x[num..10]; // should trigger out of bounds error
+   |             ^^
+   |
+   = note: `-D clippy::out-of-bounds-indexing` implied by `-D warnings`
+
+error: range is out of bounds
+  --> $DIR/issue-3102.rs:10:8
+   |
+LL |     &x[10..num]; // should trigger out of bounds error
+   |        ^^
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/out_of_bounds_indexing/simple.rs b/tests/ui/out_of_bounds_indexing/simple.rs
new file mode 100644
index 000000000000..4c541c23f5f4
--- /dev/null
+++ b/tests/ui/out_of_bounds_indexing/simple.rs
@@ -0,0 +1,22 @@
+#![warn(clippy::out_of_bounds_indexing)]
+#![allow(clippy::no_effect, clippy::unnecessary_operation)]
+
+fn main() {
+    let x = [1, 2, 3, 4];
+
+    &x[..=4];
+    &x[1..5];
+    &x[5..];
+    &x[..5];
+    &x[5..].iter().map(|x| 2 * x).collect::<Vec<i32>>();
+    &x[0..=4];
+
+    &x[4..]; // Ok, should not produce stderr.
+    &x[..4]; // Ok, should not produce stderr.
+    &x[..]; // Ok, should not produce stderr.
+    &x[1..]; // Ok, should not produce stderr.
+    &x[2..].iter().map(|x| 2 * x).collect::<Vec<i32>>(); // Ok, should not produce stderr.
+
+    &x[0..].get(..3); // Ok, should not produce stderr.
+    &x[0..3]; // Ok, should not produce stderr.
+}
diff --git a/tests/ui/out_of_bounds_indexing/simple.stderr b/tests/ui/out_of_bounds_indexing/simple.stderr
new file mode 100644
index 000000000000..3d95afcdab23
--- /dev/null
+++ b/tests/ui/out_of_bounds_indexing/simple.stderr
@@ -0,0 +1,40 @@
+error: range is out of bounds
+  --> $DIR/simple.rs:7:11
+   |
+LL |     &x[..=4];
+   |           ^
+   |
+   = note: `-D clippy::out-of-bounds-indexing` implied by `-D warnings`
+
+error: range is out of bounds
+  --> $DIR/simple.rs:8:11
+   |
+LL |     &x[1..5];
+   |           ^
+
+error: range is out of bounds
+  --> $DIR/simple.rs:9:8
+   |
+LL |     &x[5..];
+   |        ^
+
+error: range is out of bounds
+  --> $DIR/simple.rs:10:10
+   |
+LL |     &x[..5];
+   |          ^
+
+error: range is out of bounds
+  --> $DIR/simple.rs:11:8
+   |
+LL |     &x[5..].iter().map(|x| 2 * x).collect::<Vec<i32>>();
+   |        ^
+
+error: range is out of bounds
+  --> $DIR/simple.rs:12:12
+   |
+LL |     &x[0..=4];
+   |            ^
+
+error: aborting due to 6 previous errors
+