diff --git a/.editorconfig b/.editorconfig
index 32b8a7df..f16a353f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,12 +8,12 @@ root = true
 insert_final_newline = true
 
 # 2 space indentation
-[*.{h,cpp,tcc,cmake}]
+[*.{h,cpp,tcc,cmake,yml}]
 indent_style = space
 indent_size = 2
 
 # Trim traling whitespaces
-[*.{h,cpp,tcc,cmake}]
+[*.{h,cpp,tcc,cmake,yml}]
 trim_trailing_whitespace = true
 
 # UTF-8 without BOM
diff --git a/.travis.yml b/.travis.yml
index c5ec8862..d724ae9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,28 @@
 language: cpp
+
 sudo: false
+
+os:
+  - linux
+  - osx
+
 compiler:
   - gcc
   - clang
+
 addons:
   apt:
     packages:
-      - libcppunit-dev 
+      - libcppunit-dev
       - zlib1g-dev
+
+matrix:
+  exclude:
+    - os: osx
+      compiler: gcc
+
+install:
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cppunit; fi
+
 script: cmake -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_BINDINGS=ON . && make && make check