diff --git a/src/fifo.rs b/src/fifo.rs
index 9b62fa1..4542ccf 100644
--- a/src/fifo.rs
+++ b/src/fifo.rs
@@ -115,7 +115,7 @@ mod asynchronous {
     }
 
     impl FifoBuilder {
-        pub fn new() -> FifoBuilder {
+        pub fn new() -> Self {
             FifoBuilder {
                 path: FifoPath::new(),
             }
@@ -149,6 +149,12 @@ mod asynchronous {
 #[cfg(feature = "async-mio")]
 pub use asynchronous::{FifoBuilder, UnixStream};
 
+impl Default for FifoBuilder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[cfg(test)]
 mod tests {
 
diff --git a/tests/fifo_async_tests.rs b/tests/fifo_async_tests.rs
index a4e5949..ec5a238 100644
--- a/tests/fifo_async_tests.rs
+++ b/tests/fifo_async_tests.rs
@@ -84,15 +84,13 @@ fn basic_async_communication() -> std::io::Result<()> {
         while controler.step() < 2 {
             poll.poll(&mut events, None)?;
             for event in &events {
-                if event.token() == output_token && event.is_writable() {
-                    if controler.step() == 0 {
-                        controler
-                            .check_result(client.set_client_name(ClientName::new("test", "test")));
-                    }
-                } else if event.token() == input_token && event.is_readable() {
-                    if controler.step() == 1 {
-                        controler.check_result(client.check_client_name_set());
-                    }
+                if event.token() == output_token && event.is_writable() && controler.step() == 0 {
+                    controler.check_result(client.set_client_name(ClientName::new("test", "test")));
+                } else if event.token() == input_token
+                    && event.is_readable()
+                    && controler.step() == 1
+                {
+                    controler.check_result(client.check_client_name_set());
                 }
             }
         }