diff --git a/util/src/network/connection.rs b/util/src/network/connection.rs
index fa6bb7f9a..acb41bfcd 100644
--- a/util/src/network/connection.rs
+++ b/util/src/network/connection.rs
@@ -425,4 +425,85 @@ pub fn test_encryption() {
 	encoder.encrypt(&mut RefReadBuffer::new(&before2), &mut RefWriteBuffer::new(&mut got), true).unwrap();
 	encoder.reset();
 	assert_eq!(got, after2);
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use std::sync::*;
+	use super::super::stats::*;
+	use std::io::{Read, Write, Error};
+	use std::cmp;
+	use mio::{EventSet};
+	use std::collections::VecDeque;
+	use bytes::*;
+
+	struct TestSocket {
+		read_buffer: Vec<u8>,
+		write_buffer: Vec<u8>,
+		cursor: usize,
+	}
+
+	impl TestSocket {
+		fn new() -> TestSocket {
+			TestSocket {
+				read_buffer: vec![],
+				write_buffer: vec![],
+				cursor: 0,
+			}
+		}
+	}
+
+	impl Read for TestSocket {
+		fn read(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
+			let end_position = cmp::min(self.read_buffer.len(), self.cursor+buf.len());
+			let len = cmp::max(end_position - self.cursor, 0);
+			match len {
+				0 => Ok(0),
+				_ => {
+					for i in self.cursor..end_position {
+						buf[i-self.cursor] = self.read_buffer[i];
+					}
+					self.cursor = self.cursor + buf.len();
+					Ok(len)
+				}
+			}
+		}
+	}
+
+	impl Write for TestSocket {
+		fn write(&mut self, buf: &[u8]) -> Result<usize, Error> {
+			self.write_buffer.extend(buf.iter().cloned());
+			Ok(buf.len())
+		}
+
+		fn flush(&mut self) -> Result<(), Error> {
+			unimplemented!();
+		}
+	}
+
+	impl GenericSocket for TestSocket {}
+
+	type TestConnection = GenericConnection<TestSocket>;
+
+	impl TestConnection {
+		pub fn new() -> TestConnection {
+			TestConnection {
+				token: 999998888usize,
+				socket: TestSocket::new(),
+				send_queue: VecDeque::new(),
+				rec_buf: Bytes::new(),
+				rec_size: 0,
+				interest: EventSet::hup() | EventSet::readable(),
+				stats: Arc::<NetworkStats>::new(NetworkStats::new()),
+			}
+		}
+	}
+
+	#[test]
+	fn connection_expect() {
+		let mut connection = TestConnection::new();
+		connection.expect(1024);
+		assert_eq!(connection.rec_size, 1024);
+	}
 }
\ No newline at end of file
diff --git a/util/src/network/stats.rs b/util/src/network/stats.rs
index 02d904985..4f6c4be2a 100644
--- a/util/src/network/stats.rs
+++ b/util/src/network/stats.rs
@@ -48,4 +48,13 @@ impl NetworkStats {
 	pub fn sessions(&self) -> usize {
 		self.sessions.load(Ordering::Relaxed)
 	}
+
+	#[cfg(test)]
+	pub fn new() -> NetworkStats {
+		NetworkStats {
+					recv: AtomicUsize::new(0),
+					send: AtomicUsize::new(0),
+					sessions: AtomicUsize::new(0),
+		}
+	}
 }
diff --git a/util/src/network/tests.rs b/util/src/network/tests.rs
index b25943531..bccd4c27d 100644
--- a/util/src/network/tests.rs
+++ b/util/src/network/tests.rs
@@ -20,61 +20,6 @@ impl Default for TestProtocol {
 	}
 }
 
-struct TestSocket {
-	read_buffer: Vec<u8>,
-	write_buffer: Vec<u8>,
-	cursor: usize,
-}
-
-impl TestSocket {
-	fn new() -> TestSocket {
-		TestSocket {
-			read_buffer: vec![],
-			write_buffer: vec![]
-		}
-	}
-}
-
-impl Read for TestSocket {
-	fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-		let end_position = cmp::min(self.read_buffer.len(), self.cursor+buf.len());
-		let len = cmp::max(self.end_position - self.cursor, 0);
-		match len {
-			0 => Ok(0),
-			_ => {
-				bytes::copy_memory(buf, &mut self.read_buffer[cursor..len]);
-				self.cursor = self.cursor + buf.len();
-				Ok(len);
-			}
-		}
-	}
-}
-
-impl Write for TestSocket {
-	fn write(&mut self, buf: &mut [u8]) -> Result<u8> {
-		self.write_buffer.extend(buf.iter().cloned());
-		Ok(buf.len());
-	}
-}
-
-impl GenericSocket for TestSocket {}
-
-type TestConnection = GenericConnection<TestSocket>;
-
-impl TestConnection {
-	pub fn new() -> Connection {
-		Connection {
-			token: 999998888usize,
-			socket: TestSocket::new(),
-			send_queue: VecDeque::new(),
-			rec_buf: Bytes::new(),
-			rec_size: 0,
-			interest: EventSet::hup() | EventSet::readable(),
-			stats: Arc::<NetworkStats>::new(),
-		}
-	}
-}
-
 #[derive(Clone)]
 pub struct TestProtocolMessage {
 	payload: u32,
@@ -156,8 +101,3 @@ fn net_timeout() {
 		thread::sleep(Duration::from_millis(50));
 	}
 }
-
-#[test]
-fn connection_expect() {
-	let connection = TestConnection::new();
-}
\ No newline at end of file