diff --git a/.travis.yml b/.travis.yml
index 3c226c879f2..88939dd5cd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: rust
+
 rust: nightly
+
+os:
+  - linux
+  - osx
+
 sudo: false
 
 cache:
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000000..78420e23192
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,34 @@
+environment:
+    global:
+        PROJECT_NAME: rust-clippy
+    matrix:
+        - TARGET: i686-pc-windows-gnu
+          MSYS2_BITS=32
+        - TARGET: i686-pc-windows-msvc
+          MSYS2_BITS=32
+        - TARGET: x86_64-pc-windows-gnu
+          MSYS2_BITS=64
+        - TARGET: x86_64-pc-windows-msvc
+          MSYS2_BITS=64
+
+install:
+    - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+    - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
+    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+    - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
+    - rustc -V
+    - cargo -V
+
+build: false
+
+test_script:
+    - cargo build --features debugging
+    - cargo test --features debugging
+    - mkdir -p rust/cargo/bin
+    - copy target/debug/cargo-clippy rust/cargo/bin/cargo-clippy
+    - PATH=%PATH%;rust/cargo/bin cargo clippy -- -D clippy
+    - cd clippy_lints && PATH=%PATH%;../rust/cargo/bin cargo clippy -- -D clippy && cd ..
+
+notifications:
+    - provider: Email
+      on_build_success: false