diff --git a/peach-network/src/lib.rs b/peach-network/src/lib.rs
index c4d0d3b..97b011b 100644
--- a/peach-network/src/lib.rs
+++ b/peach-network/src/lib.rs
@@ -842,7 +842,7 @@ mod tests {
             let mut io = IoHandler::new();
             io.add_method("rpc_regex_error", |_| {
                 let source = regex::Error::Syntax("oh no!".to_string());
-                Err(Error::from(NetworkError::Regex { source }))
+                Err(Error::from(NetworkError::Regex(source)))
             });
             test_rpc::Rpc::from(io)
         };
@@ -886,7 +886,7 @@ mod tests {
             let mut io = IoHandler::new();
             io.add_method("rpc_wlanstate_error", |_| {
                 let source = IoError::new(ErrorKind::PermissionDenied, "oh no!");
-                Err(Error::from(NetworkError::WlanState { source }))
+                Err(Error::from(NetworkError::WlanState(source)))
             });
             test_rpc::Rpc::from(io)
         };
@@ -907,7 +907,7 @@ mod tests {
             let mut io = IoHandler::new();
             io.add_method("rpc_wlanoperstate_error", |_| {
                 let source = IoError::new(ErrorKind::PermissionDenied, "oh no!");
-                Err(Error::from(NetworkError::WlanOperstate { source }))
+                Err(Error::from(NetworkError::WlanOperstate(source)))
             });
             test_rpc::Rpc::from(io)
         };
@@ -945,9 +945,13 @@ mod tests {
         let rpc = {
             let mut io = IoHandler::new();
             io.add_method("rpc_wpactrlopen_error", |_| {
-                let fail_err = failure::err_msg("Permission denied (os error 13)").compat();
-                let source = Box::new(fail_err);
-                Err(Error::from(NetworkError::WpaCtrlOpen { source }))
+                let permission_error = IoError::new(
+                    ErrorKind::PermissionDenied,
+                    "Permission denied (os error 13)",
+                );
+                Err(Error::from(NetworkError::WpaCtrl(wpactrl::WpaError::Io(
+                    permission_error,
+                ))))
             });
             test_rpc::Rpc::from(io)
         };
@@ -956,7 +960,7 @@ mod tests {
             rpc.request("rpc_wpactrlopen_error", &()),
             r#"{
   "code": -32013,
-  "message": "Failed to open control interface for wpasupplicant: Permission denied (os error 13)"
+  "message": "WPA control interface failure: Failed to execute the specified command: Permission denied (os error 13)"
 }"#
         );
     }
@@ -967,9 +971,10 @@ mod tests {
         let rpc = {
             let mut io = IoHandler::new();
             io.add_method("rpc_wpactrlrequest_error", |_| {
-                let fail_err = failure::err_msg("oh no!").compat();
-                let source = Box::new(fail_err);
-                Err(Error::from(NetworkError::WpaCtrlRequest { source }))
+                let conn_refused_error = IoError::new(ErrorKind::ConnectionRefused, "oh no!");
+                Err(Error::from(NetworkError::WpaCtrl(wpactrl::WpaError::Io(
+                    conn_refused_error,
+                ))))
             });
             test_rpc::Rpc::from(io)
         };
@@ -977,8 +982,8 @@ mod tests {
         assert_eq!(
             rpc.request("rpc_wpactrlrequest_error", &()),
             r#"{
-  "code": -32014,
-  "message": "WPA supplicant request failed: oh no!"
+  "code": -32013,
+  "message": "WPA control interface failure: Failed to execute the specified command: oh no!"
 }"#
         );
     }