diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index 81e621318e14..2c20259fc585 100644
--- a/library/core/tests/lib.rs
+++ b/library/core/tests/lib.rs
@@ -76,5 +76,6 @@ mod result;
 mod slice;
 mod str;
 mod str_lossy;
+mod task;
 mod time;
 mod tuple;
diff --git a/library/core/tests/task.rs b/library/core/tests/task.rs
new file mode 100644
index 000000000000..d71fef9e5c87
--- /dev/null
+++ b/library/core/tests/task.rs
@@ -0,0 +1,14 @@
+use core::task::Poll;
+
+#[test]
+fn poll_const() {
+    // test that the methods of `Poll` are usable in a const context
+
+    const POLL: Poll<usize> = Poll::Pending;
+
+    const IS_READY: bool = POLL.is_ready();
+    assert!(!IS_READY);
+
+    const IS_PENDING: bool = POLL.is_pending();
+    assert!(IS_PENDING);
+}
diff --git a/src/test/ui/consts/std/poll.rs b/src/test/ui/consts/std/poll.rs
deleted file mode 100644
index 28f2ace6715f..000000000000
--- a/src/test/ui/consts/std/poll.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-
-use std::task::Poll;
-
-fn main() {
-    const POLL : Poll<usize> = Poll::Pending;
-
-    const IS_READY : bool = POLL.is_ready();
-    assert!(!IS_READY);
-
-    const IS_PENDING : bool = POLL.is_pending();
-    assert!(IS_PENDING);
-}