diff --git a/server-utils/Cargo.toml b/server-utils/Cargo.toml
index 7a6fb7b32..e07156ece 100644
--- a/server-utils/Cargo.toml
+++ b/server-utils/Cargo.toml
@@ -16,7 +16,7 @@ globset = "0.4"
 jsonrpc-core = { version = "14.0", path = "../core" }
 lazy_static = "1.1.0"
 log = "0.4"
-tokio = { version = "0.1" }
+tokio = { version = "0.1.15" }
 tokio-codec = { version = "0.1" }
 unicase = "2.0"
 
diff --git a/server-utils/src/reactor.rs b/server-utils/src/reactor.rs
index bd9d6b90c..d93708fbf 100644
--- a/server-utils/src/reactor.rs
+++ b/server-utils/src/reactor.rs
@@ -148,3 +148,15 @@ impl RpcEventLoop {
 			});
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn make_sure_rpc_event_loop_is_send_and_sync() {
+		fn is_send_and_sync<T: Send + Sync>() {}
+
+		is_send_and_sync::<RpcEventLoop>();
+	}
+}
diff --git a/tcp/src/server.rs b/tcp/src/server.rs
index 8b42ed322..a6ac59c03 100644
--- a/tcp/src/server.rs
+++ b/tcp/src/server.rs
@@ -208,3 +208,15 @@ impl Drop for Server {
 		}
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn server_is_send_and_sync() {
+		fn is_send_and_sync<T: Send + Sync>() {}
+
+		is_send_and_sync::<Server>();
+	}
+}