diff --git a/actix-server/src/lib.rs b/actix-server/src/lib.rs
index 79b5d57b..64aca7e4 100644
--- a/actix-server/src/lib.rs
+++ b/actix-server/src/lib.rs
@@ -125,3 +125,17 @@ impl<T> Future for JoinAll<T> {
         }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[actix_rt::test]
+    async fn test_join_all() {
+        let futs = vec![ready(Ok(1)), ready(Err(3)), ready(Ok(9))];
+        let mut res = join_all(futs).await.into_iter();
+        assert_eq!(Ok(1), res.next().unwrap());
+        assert_eq!(Err(3), res.next().unwrap());
+        assert_eq!(Ok(9), res.next().unwrap());
+    }
+}
diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs
index 1f567934..2604df74 100644
--- a/actix-server/tests/test_server.rs
+++ b/actix-server/tests/test_server.rs
@@ -55,9 +55,9 @@ fn test_listen() {
                 .workers(1)
                 .listen("test", lst, move || fn_service(|_| ok::<_, ()>(())))
                 .unwrap()
-                .start()
+                .start();
+            let _ = tx.send(actix_rt::System::current());
         });
-        let _ = tx.send(actix_rt::System::current());
         let _ = sys.run();
     });
     let sys = rx.recv().unwrap();