diff --git a/tokio-net/src/tcp/stream.rs b/tokio-net/src/tcp/stream.rs
index 67b7619d8..3171bdc6d 100644
--- a/tokio-net/src/tcp/stream.rs
+++ b/tokio-net/src/tcp/stream.rs
@@ -827,6 +827,7 @@ impl AsyncWrite for TcpStream {
     }
 
     fn poll_shutdown(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
+        self.shutdown(std::net::Shutdown::Write)?;
         Poll::Ready(Ok(()))
     }
 
diff --git a/tokio-net/tests/tcp_shutdown.rs b/tokio-net/tests/tcp_shutdown.rs
new file mode 100644
index 000000000..bf1ebf990
--- /dev/null
+++ b/tokio-net/tests/tcp_shutdown.rs
@@ -0,0 +1,29 @@
+#![warn(rust_2018_idioms)]
+
+use tokio::io::AsyncWriteExt;
+use tokio::net::{TcpListener, TcpStream};
+use tokio::prelude::*;
+use tokio_test::assert_ok;
+
+#[tokio::test]
+async fn shutdown() {
+    let addr = assert_ok!("127.0.0.1:0".parse());
+    let mut srv = assert_ok!(TcpListener::bind(&addr));
+    let addr = assert_ok!(srv.local_addr());
+
+    tokio::spawn(async move {
+        let mut stream = assert_ok!(TcpStream::connect(&addr).await);
+
+        assert_ok!(AsyncWriteExt::shutdown(&mut stream).await);
+
+        let mut buf = [0; 1];
+        let n = assert_ok!(stream.read(&mut buf).await);
+        assert_eq!(n, 0);
+    });
+
+    let (stream, _) = assert_ok!(srv.accept().await);
+    let (mut rd, mut wr) = stream.split();
+
+    let n = assert_ok!(rd.copy(&mut wr).await);
+    assert_eq!(n, 0);
+}