diff --git a/.rustfmt.toml b/.rustfmt.toml
deleted file mode 100644
index 7d2cf549..00000000
--- a/.rustfmt.toml
+++ /dev/null
@@ -1 +0,0 @@
-merge_imports = true
diff --git a/.travis.yml b/.travis.yml
index 79529cb9..15f4a38a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,10 @@
 language: "rust"
+before_script:
+  - "rustup component add rustfmt"
+script:
+  - "cargo fmt --all -- --check"
+  - "cargo build --verbose"
+  - "cargo test --verbose"
 notifications:
   email: false
   irc:
diff --git a/examples/hello_world.rs b/examples/hello_world.rs
index ff45071d..6c062444 100644
--- a/examples/hello_world.rs
+++ b/examples/hello_world.rs
@@ -63,6 +63,10 @@ fn main() {
         }
     };
 
-    tokio::run(hello_world(homeserver_url.parse().unwrap(), room)
-               .map_err(|e| { dbg!(e); () }));
+    tokio::run(
+        hello_world(homeserver_url.parse().unwrap(), room).map_err(|e| {
+            dbg!(e);
+            ()
+        }),
+    );
 }
diff --git a/src/lib.rs b/src/lib.rs
index 6df99676..55882271 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,7 +3,11 @@
 #![deny(missing_debug_implementations)]
 #![deny(missing_docs)]
 
-use std::{convert::TryInto, str::FromStr, sync::{Arc, Mutex}};
+use std::{
+    convert::TryInto,
+    str::FromStr,
+    sync::{Arc, Mutex},
+};
 
 use futures::{
     future::{Future, FutureFrom, IntoFuture},