diff --git a/Cargo.toml b/Cargo.toml
index d6bd22b089..f963204539 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,7 @@ members = [
   "futures-io",
   "futures-macro",
   "futures-sink",
+  "futures-task",
   "futures-util",
   "futures-test",
 ]
diff --git a/futures-core/src/future/mod.rs b/futures-core/src/future.rs
similarity index 97%
rename from futures-core/src/future/mod.rs
rename to futures-core/src/future.rs
index ba9398eef6..35a0fd3baa 100644
--- a/futures-core/src/future/mod.rs
+++ b/futures-core/src/future.rs
@@ -6,9 +6,6 @@ use core::task::{Context, Poll};
 
 pub use core::future::Future;
 
-mod future_obj;
-pub use self::future_obj::{FutureObj, LocalFutureObj, UnsafeFutureObj};
-
 /// An owned dynamically typed [`Future`] for use in cases where you can't
 /// statically type your result or need to add some indirection.
 #[cfg(feature = "alloc")]
diff --git a/futures-core/src/task/__internal/atomic_waker.rs b/futures-core/src/task/__internal/atomic_waker.rs
index b381826986..2276e33104 100644
--- a/futures-core/src/task/__internal/atomic_waker.rs
+++ b/futures-core/src/task/__internal/atomic_waker.rs
@@ -1,8 +1,8 @@
-use core::fmt;
 use core::cell::UnsafeCell;
+use core::fmt;
 use core::sync::atomic::AtomicUsize;
 use core::sync::atomic::Ordering::{Acquire, Release, AcqRel};
-use crate::task::Waker;
+use core::task::Waker;
 
 /// A synchronization primitive for task wakeup.
 ///
diff --git a/futures-core/src/task/mod.rs b/futures-core/src/task/mod.rs
index c03d4074f2..362b376e04 100644
--- a/futures-core/src/task/mod.rs
+++ b/futures-core/src/task/mod.rs
@@ -3,9 +3,6 @@
 #[macro_use]
 mod poll;
 
-mod spawn;
-pub use self::spawn::{Spawn, LocalSpawn, SpawnError};
-
 #[doc(hidden)]
 pub mod __internal;
 
diff --git a/futures-executor/Cargo.toml b/futures-executor/Cargo.toml
index ac5f582253..f3df37c439 100644
--- a/futures-executor/Cargo.toml
+++ b/futures-executor/Cargo.toml
@@ -16,11 +16,12 @@ name = "futures_executor"
 
 [features]
 default = ["std"]
-std = ["futures-core-preview/std", "futures-util-preview/std"]
+std = ["futures-core-preview/std", "futures-task-preview/std", "futures-util-preview/std"]
 thread-pool = ["std", "num_cpus"]
 
 [dependencies]
 futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.19", default-features = false }
+futures-task-preview = { path = "../futures-task", version = "=0.3.0-alpha.19", default-features = false }
 futures-util-preview = { path = "../futures-util", version = "=0.3.0-alpha.19", default-features = false }
 num_cpus = { version = "1.8.0", optional = true }
 
diff --git a/futures-executor/src/local_pool.rs b/futures-executor/src/local_pool.rs
index 578d71185f..84795dbfc0 100644
--- a/futures-executor/src/local_pool.rs
+++ b/futures-executor/src/local_pool.rs
@@ -1,8 +1,9 @@
 use crate::enter;
-use futures_core::future::{Future, FutureObj, LocalFutureObj};
-use futures_core::stream::{Stream};
-use futures_core::task::{Context, Poll, Spawn, LocalSpawn, SpawnError};
-use futures_util::task::{waker_ref, ArcWake};
+use futures_core::future::Future;
+use futures_core::stream::Stream;
+use futures_core::task::{Context, Poll};
+use futures_task::{FutureObj, LocalFutureObj, Spawn, LocalSpawn, SpawnError};
+use futures_task::{waker_ref, ArcWake};
 use futures_util::stream::FuturesUnordered;
 use futures_util::stream::StreamExt;
 use futures_util::pin_mut;
@@ -19,10 +20,10 @@ use std::thread::{self, Thread};
 /// little work in between I/O actions.
 ///
 /// To get a handle to the pool that implements
-/// [`Spawn`](futures_core::task::Spawn), use the
+/// [`Spawn`](futures_task::Spawn), use the
 /// [`spawner()`](LocalPool::spawner) method. Because the executor is
 /// single-threaded, it supports a special form of task spawning for non-`Send`
-/// futures, via [`spawn_local_obj`](futures_core::task::LocalSpawn::spawn_local_obj).
+/// futures, via [`spawn_local_obj`](futures_task::LocalSpawn::spawn_local_obj).
 #[derive(Debug)]
 pub struct LocalPool {
     pool: FuturesUnordered<LocalFutureObj<'static, ()>>,
@@ -30,7 +31,7 @@ pub struct LocalPool {
 }
 
 /// A handle to a [`LocalPool`](LocalPool) that implements
-/// [`Spawn`](futures_core::task::Spawn).
+/// [`Spawn`](futures_task::Spawn).
 #[derive(Clone, Debug)]
 pub struct LocalSpawner {
     incoming: Weak<Incoming>,
diff --git a/futures-executor/src/thread_pool.rs b/futures-executor/src/thread_pool.rs
index 893d9ae5fc..f0192e86ec 100644
--- a/futures-executor/src/thread_pool.rs
+++ b/futures-executor/src/thread_pool.rs
@@ -1,9 +1,10 @@
 use crate::enter;
 use crate::unpark_mutex::UnparkMutex;
-use futures_core::future::{Future, FutureObj};
-use futures_core::task::{Context, Poll, Spawn, SpawnError};
+use futures_core::future::Future;
+use futures_core::task::{Context, Poll};
+use futures_task::{FutureObj, Spawn, SpawnError};
+use futures_task::{ArcWake, waker_ref};
 use futures_util::future::FutureExt;
-use futures_util::task::{ArcWake, waker_ref};
 use std::cmp;
 use std::fmt;
 use std::io;
diff --git a/futures-task/Cargo.toml b/futures-task/Cargo.toml
new file mode 100644
index 0000000000..356fb6f6fa
--- /dev/null
+++ b/futures-task/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "futures-task-preview"
+edition = "2018"
+version = "0.3.0-alpha.19"
+authors = ["Alex Crichton <alex@alexcrichton.com>"]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/rust-lang-nursery/futures-rs"
+homepage = "https://rust-lang-nursery.github.io/futures-rs"
+documentation = "https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.18/futures_core"
+description = """
+Tools for working with tasks.
+"""
+
+[lib]
+name = "futures_task"
+
+[features]
+default = ["std"]
+std = ["alloc"]
+alloc = []
+
+# Unstable features
+# These features are outside of the normal semver guarantees and require the
+# `unstable` feature as an explicit opt-in to unstable API.
+unstable = []
+cfg-target-has-atomic = []
+
+[dependencies]
+
+[dev-dependencies]
+futures-preview = { path = "../futures", version = "=0.3.0-alpha.19" }
diff --git a/futures-util/src/task/arc_wake.rs b/futures-task/src/arc_wake.rs
similarity index 88%
rename from futures-util/src/task/arc_wake.rs
rename to futures-task/src/arc_wake.rs
index 6307afc84f..aa6de0fc43 100644
--- a/futures-util/src/task/arc_wake.rs
+++ b/futures-task/src/arc_wake.rs
@@ -9,12 +9,12 @@ use alloc::sync::Arc;
 ///
 /// Currently, there are two ways to convert `ArcWake` into [`Waker`]:
 ///
-/// * [`waker`](crate::task::waker()) converts `Arc<impl ArcWake>` into [`Waker`].
-/// * [`waker_ref`](crate::task::waker_ref()) converts `&Arc<impl ArcWake>` into [`WakerRef`] that
+/// * [`waker`](super::waker()) converts `Arc<impl ArcWake>` into [`Waker`].
+/// * [`waker_ref`](super::waker_ref()) converts `&Arc<impl ArcWake>` into [`WakerRef`] that
 ///   provides access to a [`&Waker`][`Waker`].
 ///
 /// [`Waker`]: std::task::Waker
-/// [`WakerRef`]: crate::task::WakerRef
+/// [`WakerRef`]: super::WakerRef
 // Note: Send + Sync required because `Arc<T>` doesn't automatically imply
 // those bounds, but `Waker` implements them.
 pub trait ArcWake: Send + Sync {
diff --git a/futures-core/src/future/future_obj.rs b/futures-task/src/future_obj.rs
similarity index 99%
rename from futures-core/src/future/future_obj.rs
rename to futures-task/src/future_obj.rs
index fe4dcf6cfc..6acdf7c37f 100644
--- a/futures-core/src/future/future_obj.rs
+++ b/futures-task/src/future_obj.rs
@@ -104,8 +104,7 @@ impl<T> Drop for LocalFutureObj<'_, T> {
 /// contexts.
 ///
 /// You should generally not need to use this type outside of `no_std` or when
-/// implementing `Spawn`, consider using [`BoxFuture`](crate::future::BoxFuture)
-/// instead.
+/// implementing `Spawn`, consider using `BoxFuture` instead.
 pub struct FutureObj<'a, T>(LocalFutureObj<'a, T>);
 
 impl<T> Unpin for FutureObj<'_, T> {}
diff --git a/futures-task/src/lib.rs b/futures-task/src/lib.rs
new file mode 100644
index 0000000000..18e6c02fda
--- /dev/null
+++ b/futures-task/src/lib.rs
@@ -0,0 +1,57 @@
+//! Tools for working with tasks.
+
+#![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
+// It cannot be included in the published code because this lints have false positives in the minimum required version.
+#![cfg_attr(test, warn(single_use_lifetimes))]
+#![warn(clippy::all)]
+
+#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
+
+#![doc(html_root_url = "https://docs.rs/futures-task-preview/0.3.0-alpha.19")]
+
+#[cfg(all(feature = "cfg-target-has-atomic", not(feature = "unstable")))]
+compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feature as an explicit opt-in to unstable features");
+
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+macro_rules! cfg_target_has_atomic {
+    ($($item:item)*) => {$(
+        #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+        $item
+    )*};
+}
+
+mod spawn;
+pub use crate::spawn::{Spawn, SpawnError, LocalSpawn};
+
+cfg_target_has_atomic! {
+    #[cfg(feature = "alloc")]
+    mod arc_wake;
+    #[cfg(feature = "alloc")]
+    pub use crate::arc_wake::ArcWake;
+
+    #[cfg(feature = "alloc")]
+    mod waker;
+    #[cfg(feature = "alloc")]
+    pub use crate::waker::waker;
+
+    #[cfg(feature = "alloc")]
+    mod waker_ref;
+    #[cfg(feature = "alloc")]
+    pub use crate::waker_ref::{waker_ref, WakerRef};
+}
+
+mod future_obj;
+pub use crate::future_obj::{FutureObj, LocalFutureObj, UnsafeFutureObj};
+
+mod noop_waker;
+pub use crate::noop_waker::noop_waker;
+#[cfg(feature = "std")]
+pub use crate::noop_waker::noop_waker_ref;
+
+pub use core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
diff --git a/futures-util/src/task/noop_waker.rs b/futures-task/src/noop_waker.rs
similarity index 95%
rename from futures-util/src/task/noop_waker.rs
rename to futures-task/src/noop_waker.rs
index b7016e1570..a0924ad925 100644
--- a/futures-util/src/task/noop_waker.rs
+++ b/futures-task/src/noop_waker.rs
@@ -1,5 +1,6 @@
 //! Utilities for creating zero-cost wakers that don't do anything.
-use futures_core::task::{RawWaker, RawWakerVTable, Waker};
+
+use core::task::{RawWaker, RawWakerVTable, Waker};
 use core::ptr::null;
 #[cfg(feature = "std")]
 use core::cell::UnsafeCell;
diff --git a/futures-core/src/task/spawn.rs b/futures-task/src/spawn.rs
similarity index 86%
rename from futures-core/src/task/spawn.rs
rename to futures-task/src/spawn.rs
index 895e81b598..9616e190ae 100644
--- a/futures-core/src/task/spawn.rs
+++ b/futures-task/src/spawn.rs
@@ -1,4 +1,4 @@
-use crate::future::{FutureObj, LocalFutureObj};
+use crate::{FutureObj, LocalFutureObj};
 use core::fmt;
 
 /// The `Spawn` trait allows for pushing futures onto an executor that will
@@ -12,8 +12,7 @@ pub trait Spawn {
     /// represent relatively rare scenarios, such as the executor
     /// having been shut down so that it is no longer able to accept
     /// tasks.
-    fn spawn_obj(&mut self, future: FutureObj<'static, ()>)
-        -> Result<(), SpawnError>;
+    fn spawn_obj(&mut self, future: FutureObj<'static, ()>) -> Result<(), SpawnError>;
 
     /// Determines whether the executor is able to spawn new tasks.
     ///
@@ -38,8 +37,7 @@ pub trait LocalSpawn {
     /// represent relatively rare scenarios, such as the executor
     /// having been shut down so that it is no longer able to accept
     /// tasks.
-    fn spawn_local_obj(&mut self, future: LocalFutureObj<'static, ()>)
-        -> Result<(), SpawnError>;
+    fn spawn_local_obj(&mut self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError>;
 
     /// Determines whether the executor is able to spawn new tasks.
     ///
@@ -60,9 +58,7 @@ pub struct SpawnError {
 
 impl fmt::Debug for SpawnError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("SpawnError")
-            .field(&"shutdown")
-            .finish()
+        f.debug_tuple("SpawnError").field(&"shutdown").finish()
     }
 }
 
@@ -88,8 +84,7 @@ impl SpawnError {
 }
 
 impl<Sp: ?Sized + Spawn> Spawn for &mut Sp {
-    fn spawn_obj(&mut self, future: FutureObj<'static, ()>)
-    -> Result<(), SpawnError> {
+    fn spawn_obj(&mut self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
         Sp::spawn_obj(self, future)
     }
 
@@ -99,8 +94,7 @@ impl<Sp: ?Sized + Spawn> Spawn for &mut Sp {
 }
 
 impl<Sp: ?Sized + LocalSpawn> LocalSpawn for &mut Sp {
-    fn spawn_local_obj(&mut self, future: LocalFutureObj<'static, ()>)
-    -> Result<(), SpawnError> {
+    fn spawn_local_obj(&mut self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
         Sp::spawn_local_obj(self, future)
     }
 
@@ -111,12 +105,11 @@ impl<Sp: ?Sized + LocalSpawn> LocalSpawn for &mut Sp {
 
 #[cfg(feature = "alloc")]
 mod if_alloc {
-    use alloc::boxed::Box;
     use super::*;
+    use alloc::boxed::Box;
 
     impl<Sp: ?Sized + Spawn> Spawn for Box<Sp> {
-        fn spawn_obj(&mut self, future: FutureObj<'static, ()>)
-        -> Result<(), SpawnError> {
+        fn spawn_obj(&mut self, future: FutureObj<'static, ()>) -> Result<(), SpawnError> {
             (**self).spawn_obj(future)
         }
 
@@ -126,8 +119,7 @@ mod if_alloc {
     }
 
     impl<Sp: ?Sized + LocalSpawn> LocalSpawn for Box<Sp> {
-        fn spawn_local_obj(&mut self, future: LocalFutureObj<'static, ()>)
-        -> Result<(), SpawnError> {
+        fn spawn_local_obj(&mut self, future: LocalFutureObj<'static, ()>) -> Result<(), SpawnError> {
             (**self).spawn_local_obj(future)
         }
 
diff --git a/futures-util/src/task/waker.rs b/futures-task/src/waker.rs
similarity index 100%
rename from futures-util/src/task/waker.rs
rename to futures-task/src/waker.rs
diff --git a/futures-util/src/task/waker_ref.rs b/futures-task/src/waker_ref.rs
similarity index 100%
rename from futures-util/src/task/waker_ref.rs
rename to futures-task/src/waker_ref.rs
diff --git a/futures-test/Cargo.toml b/futures-test/Cargo.toml
index ef84e47e8b..20ce2095a2 100644
--- a/futures-test/Cargo.toml
+++ b/futures-test/Cargo.toml
@@ -16,6 +16,7 @@ name = "futures_test"
 
 [dependencies]
 futures-core-preview = { version = "=0.3.0-alpha.19", path = "../futures-core", default-features = false }
+futures-task-preview = { version = "=0.3.0-alpha.19", path = "../futures-task", default-features = false }
 futures-io-preview = { version = "=0.3.0-alpha.19", path = "../futures-io", default-features = false }
 futures-util-preview = { version = "=0.3.0-alpha.19", path = "../futures-util", default-features = false }
 futures-executor-preview = { version = "=0.3.0-alpha.19", path = "../futures-executor", default-features = false }
@@ -26,4 +27,4 @@ futures-preview = { version = "=0.3.0-alpha.19", path = "../futures", default-fe
 
 [features]
 default = ["std"]
-std = ["futures-core-preview/std", "futures-io-preview/std", "futures-util-preview/std", "futures-util-preview/io", "futures-executor-preview/std"]
+std = ["futures-core-preview/std", "futures-task-preview/std", "futures-io-preview/std", "futures-util-preview/std", "futures-util-preview/io", "futures-executor-preview/std"]
diff --git a/futures-test/src/task/mod.rs b/futures-test/src/task/mod.rs
index f2a834e041..3ed8d3c27b 100644
--- a/futures-test/src/task/mod.rs
+++ b/futures-test/src/task/mod.rs
@@ -12,7 +12,7 @@
 //! This module provides utilities for creating test
 //! [`Context`](futures_core::task::Context)s,
 //! [`Waker`](futures_core::task::Waker)s and
-//! [`Spawn`](futures_core::task::Spawn) implementations.
+//! [`Spawn`](futures_task::Spawn) implementations.
 //!
 //! Test contexts:
 //! - [`noop_context`](crate::task::noop_context) creates a context that ignores calls to
diff --git a/futures-test/src/task/noop_spawner.rs b/futures-test/src/task/noop_spawner.rs
index 947fd119e6..517a15b17d 100644
--- a/futures-test/src/task/noop_spawner.rs
+++ b/futures-test/src/task/noop_spawner.rs
@@ -1,7 +1,6 @@
-use futures_core::future::FutureObj;
-use futures_core::task::{Spawn, SpawnError};
+use futures_task::{Spawn, SpawnError, FutureObj};
 
-/// An implementation of [`Spawn`](futures_core::task::Spawn) that
+/// An implementation of [`Spawn`](futures_task::Spawn) that
 /// discards spawned futures when used.
 ///
 /// # Examples
diff --git a/futures-test/src/task/panic_spawner.rs b/futures-test/src/task/panic_spawner.rs
index 4206d44d9e..4766ee7171 100644
--- a/futures-test/src/task/panic_spawner.rs
+++ b/futures-test/src/task/panic_spawner.rs
@@ -1,7 +1,6 @@
-use futures_core::future::FutureObj;
-use futures_core::task::{Spawn, SpawnError};
+use futures_task::{Spawn, SpawnError, FutureObj};
 
-/// An implementation of [`Spawn`](futures_core::task::Spawn) that panics
+/// An implementation of [`Spawn`](futures_task::Spawn) that panics
 /// when used.
 ///
 /// # Examples
diff --git a/futures-test/src/task/record_spawner.rs b/futures-test/src/task/record_spawner.rs
index 3b13d00222..3db983d5b8 100644
--- a/futures-test/src/task/record_spawner.rs
+++ b/futures-test/src/task/record_spawner.rs
@@ -1,7 +1,6 @@
-use futures_core::future::FutureObj;
-use futures_core::task::{Spawn, SpawnError};
+use futures_task::{Spawn, SpawnError, FutureObj};
 
-/// An implementation of [`Spawn`](futures_core::task::Spawn) that records
+/// An implementation of [`Spawn`](futures_task::Spawn) that records
 /// any [`Future`](futures_core::future::Future)s spawned on it.
 ///
 /// # Examples
diff --git a/futures-util/Cargo.toml b/futures-util/Cargo.toml
index 68cacdef42..93e9746710 100644
--- a/futures-util/Cargo.toml
+++ b/futures-util/Cargo.toml
@@ -16,8 +16,8 @@ name = "futures_util"
 
 [features]
 default = ["std"]
-std = ["alloc", "futures-core-preview/std", "slab"]
-alloc = ["futures-core-preview/alloc"]
+std = ["alloc", "futures-core-preview/std", "futures-task-preview/std", "slab"]
+alloc = ["futures-core-preview/alloc", "futures-task-preview/alloc"]
 async-await = []
 async-await-macro = ["async-await", "futures-macro-preview", "proc-macro-hack", "proc-macro-nested"]
 compat = ["std", "futures_01"]
@@ -29,13 +29,14 @@ channel = ["std", "futures-channel-preview"]
 # Unstable features
 # These features are outside of the normal semver guarantees and require the
 # `unstable` feature as an explicit opt-in to unstable API.
-unstable = ["futures-core-preview/unstable"]
-cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic"]
+unstable = ["futures-core-preview/unstable", "futures-task-preview/unstable"]
+cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-task-preview/cfg-target-has-atomic"]
 bilock = []
 read-initializer = ["io", "futures-io-preview/read-initializer", "futures-io-preview/unstable"]
 
 [dependencies]
 futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.19", default-features = false }
+futures-task-preview = { path = "../futures-task", version = "=0.3.0-alpha.19", default-features = false }
 futures-channel-preview = { path = "../futures-channel", version = "=0.3.0-alpha.19", default-features = false, features = ["std"], optional = true }
 futures-io-preview = { path = "../futures-io", version = "=0.3.0-alpha.19", default-features = false, features = ["std"], optional = true }
 futures-sink-preview = { path = "../futures-sink", version = "=0.3.0-alpha.19", default-features = false, optional = true }
diff --git a/futures-util/src/compat/executor.rs b/futures-util/src/compat/executor.rs
index 1fe080055e..2df900c45f 100644
--- a/futures-util/src/compat/executor.rs
+++ b/futures-util/src/compat/executor.rs
@@ -6,8 +6,7 @@ use crate::{
 };
 use futures_01::Future as Future01;
 use futures_01::future::{Executor as Executor01, ExecuteError as ExecuteError01};
-use futures_core::task::{Spawn as Spawn03, SpawnError as SpawnError03};
-use futures_core::future::FutureObj;
+use futures_task::{FutureObj, Spawn as Spawn03, SpawnError as SpawnError03};
 
 /// A future that can run on a futures 0.1
 /// [`Executor`](futures_01::future::Executor).
@@ -18,7 +17,7 @@ pub trait Executor01CompatExt: Executor01<Executor01Future> +
                                Clone + Send + 'static
 {
     /// Converts a futures 0.1 [`Executor`](futures_01::future::Executor) into a
-    /// futures 0.3 [`Spawn`](futures_core::task::Spawn).
+    /// futures 0.3 [`Spawn`](futures_task::Spawn).
     ///
     /// ```
     /// use futures::task::SpawnExt;
@@ -57,7 +56,7 @@ where Ex: Executor01<Executor01Future> + Clone + Send + 'static
 }
 
 /// Converts a futures 0.1 [`Executor`](futures_01::future::Executor) into a
-/// futures 0.3 [`Spawn`](futures_core::task::Spawn).
+/// futures 0.3 [`Spawn`](futures_task::Spawn).
 #[derive(Debug, Clone)]
 pub struct Executor01As03<Ex> {
     executor01: Ex
diff --git a/futures-util/src/future/mod.rs b/futures-util/src/future/mod.rs
index 249fb59f22..3f4bb01436 100644
--- a/futures-util/src/future/mod.rs
+++ b/futures-util/src/future/mod.rs
@@ -7,6 +7,7 @@
 #[cfg(feature = "alloc")]
 pub use futures_core::future::{BoxFuture, LocalBoxFuture};
 pub use futures_core::future::{FusedFuture, Future, TryFuture};
+pub use futures_task::{FutureObj, LocalFutureObj, UnsafeFutureObj};
 
 // Extension traits and combinators
 
diff --git a/futures-util/src/stream/futures_unordered/mod.rs b/futures-util/src/stream/futures_unordered/mod.rs
index 6c8d8b1065..ff4efa8321 100644
--- a/futures-util/src/stream/futures_unordered/mod.rs
+++ b/futures-util/src/stream/futures_unordered/mod.rs
@@ -3,10 +3,11 @@
 //! This module is only available when the `std` or `alloc` feature of this
 //! library is activated, and it is activated by default.
 
-use crate::task::{AtomicWaker};
-use futures_core::future::{Future, FutureObj, LocalFutureObj};
+use futures_core::future::Future;
 use futures_core::stream::{FusedStream, Stream};
-use futures_core::task::{Context, Poll, Spawn, LocalSpawn, SpawnError};
+use futures_core::task::{Context, Poll};
+use futures_task::{FutureObj, LocalFutureObj, Spawn, LocalSpawn, SpawnError};
+use crate::task::AtomicWaker;
 use core::cell::UnsafeCell;
 use core::fmt::{self, Debug};
 use core::iter::FromIterator;
diff --git a/futures-util/src/task/mod.rs b/futures-util/src/task/mod.rs
index fdc70136e9..fb3b7adacd 100644
--- a/futures-util/src/task/mod.rs
+++ b/futures-util/src/task/mod.rs
@@ -2,29 +2,27 @@
 
 cfg_target_has_atomic! {
     #[cfg(feature = "alloc")]
-    mod arc_wake;
-    #[cfg(feature = "alloc")]
-    pub use self::arc_wake::ArcWake;
+    pub use futures_task::ArcWake;
 
     #[cfg(feature = "alloc")]
-    mod waker;
-    #[cfg(feature = "alloc")]
-    pub use self::waker::waker;
+    pub use futures_task::waker;
 
     #[cfg(feature = "alloc")]
-    mod waker_ref;
-    #[cfg(feature = "alloc")]
-    pub use self::waker_ref::{waker_ref, WakerRef};
+    pub use futures_task::{waker_ref, WakerRef};
 
     pub use futures_core::task::__internal::AtomicWaker;
 }
 
-mod noop_waker;
-pub use self::noop_waker::noop_waker;
-#[cfg(feature = "std")]
-pub use self::noop_waker::noop_waker_ref;
-
 mod spawn;
 pub use self::spawn::{SpawnExt, LocalSpawnExt};
 
 pub use futures_core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
+
+pub use futures_task::{
+    Spawn, LocalSpawn, SpawnError,
+    FutureObj, LocalFutureObj, UnsafeFutureObj,
+};
+
+pub use futures_task::noop_waker;
+#[cfg(feature = "std")]
+pub use futures_task::noop_waker_ref;
diff --git a/futures-util/src/task/spawn.rs b/futures-util/src/task/spawn.rs
index a9a2e791b1..ba2b4be026 100644
--- a/futures-util/src/task/spawn.rs
+++ b/futures-util/src/task/spawn.rs
@@ -1,4 +1,4 @@
-use futures_core::task::{LocalSpawn, Spawn};
+use futures_task::{LocalSpawn, Spawn};
 
 #[cfg(feature = "compat")] use crate::compat::Compat;
 
@@ -6,9 +6,9 @@ use futures_core::task::{LocalSpawn, Spawn};
 #[cfg(feature = "std")]
 use crate::future::{FutureExt, RemoteHandle};
 #[cfg(feature = "alloc")]
-use futures_core::future::{Future, FutureObj, LocalFutureObj};
+use futures_core::future::Future;
 #[cfg(feature = "alloc")]
-use futures_core::task::SpawnError;
+use futures_task::{SpawnError, FutureObj, LocalFutureObj};
 #[cfg(feature = "alloc")]
 use alloc::boxed::Box;
 
diff --git a/futures/Cargo.toml b/futures/Cargo.toml
index 119ae3e9e7..4caa87e728 100644
--- a/futures/Cargo.toml
+++ b/futures/Cargo.toml
@@ -23,6 +23,7 @@ travis-ci = { repository = "rust-lang-nursery/futures-rs" }
 
 [dependencies]
 futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.19", default-features = false }
+futures-task-preview = { path = "../futures-task", version = "=0.3.0-alpha.19", default-features = false }
 futures-channel-preview = { path = "../futures-channel", version = "=0.3.0-alpha.19", default-features = false, features = ["sink"] }
 futures-executor-preview = { path = "../futures-executor", version = "=0.3.0-alpha.19", default-features = false, optional = true }
 futures-io-preview = { path = "../futures-io", version = "=0.3.0-alpha.19", default-features = false }
@@ -37,8 +38,8 @@ assert_matches = "1.3.0"
 
 [features]
 default = ["std", "executor"]
-std = ["alloc", "futures-core-preview/std", "futures-io-preview/std", "futures-sink-preview/std", "futures-util-preview/std", "futures-util-preview/io", "futures-util-preview/channel"]
-alloc = ["futures-core-preview/alloc", "futures-sink-preview/alloc", "futures-channel-preview/alloc", "futures-util-preview/alloc"]
+std = ["alloc", "futures-core-preview/std", "futures-task-preview/std", "futures-io-preview/std", "futures-sink-preview/std", "futures-util-preview/std", "futures-util-preview/io", "futures-util-preview/channel"]
+alloc = ["futures-core-preview/alloc", "futures-task-preview/alloc", "futures-sink-preview/alloc", "futures-channel-preview/alloc", "futures-util-preview/alloc"]
 async-await = ["futures-util-preview/async-await", "futures-util-preview/async-await-macro"]
 compat = ["std", "futures-util-preview/compat"]
 io-compat = ["compat", "futures-util-preview/io-compat"]
@@ -48,8 +49,8 @@ thread-pool = ["executor", "futures-executor-preview/thread-pool"]
 # Unstable features
 # These features are outside of the normal semver guarantees and require the
 # `unstable` feature as an explicit opt-in to unstable API.
-unstable = ["futures-core-preview/unstable", "futures-channel-preview/unstable", "futures-io-preview/unstable", "futures-util-preview/unstable"]
-cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-channel-preview/cfg-target-has-atomic", "futures-util-preview/cfg-target-has-atomic"]
+unstable = ["futures-core-preview/unstable", "futures-task-preview/unstable", "futures-channel-preview/unstable", "futures-io-preview/unstable", "futures-util-preview/unstable"]
+cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-task-preview/cfg-target-has-atomic", "futures-channel-preview/cfg-target-has-atomic", "futures-util-preview/cfg-target-has-atomic"]
 bilock = ["futures-util-preview/bilock"]
 read-initializer = ["futures-io-preview/read-initializer", "futures-util-preview/read-initializer"]
 
diff --git a/futures/src/lib.rs b/futures/src/lib.rs
index 3c95215b2b..11334dda5b 100644
--- a/futures/src/lib.rs
+++ b/futures/src/lib.rs
@@ -184,12 +184,13 @@ pub mod future {
 
     pub use futures_core::future::{
         Future, TryFuture, FusedFuture,
-        FutureObj, LocalFutureObj, UnsafeFutureObj,
     };
 
     #[cfg(feature = "alloc")]
     pub use futures_core::future::{BoxFuture, LocalBoxFuture};
 
+    pub use futures_task::{FutureObj, LocalFutureObj, UnsafeFutureObj};
+
     pub use futures_util::future::{
         lazy, Lazy,
         maybe_done, MaybeDone,
@@ -445,9 +446,11 @@ pub mod task {
     //! The remaining types and traits in the module are used for implementing
     //! executors or dealing with synchronization issues around task wakeup.
 
-    pub use futures_core::task::{
-        Context, Poll, Spawn, LocalSpawn, SpawnError,
-        Waker, RawWaker, RawWakerVTable
+    pub use futures_core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
+
+    pub use futures_task::{
+        Spawn, LocalSpawn, SpawnError,
+        FutureObj, LocalFutureObj, UnsafeFutureObj,
     };
 
     pub use futures_util::task::noop_waker;