diff --git a/.travis.yml b/.travis.yml
index 7e64a0c..3b45fd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,16 @@
-language: ruby
-rvm:
-  - "1.9.3"
-  - "2.0.0"
+language: c
+
+matrix:
+ include:
+    - os: osx
+      compiler: clang
+      osx_image: xcode7.3
+    - os: linux
+      dist: trusty
+      compiler: gcc
+
+before_install:
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.1 && rvm use 2.1 && ruby -v; fi
 script:
   - cd test && rake ci
   - make -s
diff --git a/test/Makefile b/test/Makefile
index f5a167b..6c1120f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,15 @@
 CC = gcc
 ifeq ($(shell uname -s), Darwin)
 CC = clang
+CFLAGS += -std=c99 -pedantic -Wall -Weverything -Werror
+CFLAGS += -Wno-unknown-warning-option -Wno-switch-enum
+CFLAGS += -Wno-padded -Wno-double-promotion -Wno-missing-noreturn
+CFLAGS += -Wno-missing-prototypes
+endif
+ifeq ($(shell uname -s), Linux)
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
 endif
 #DEBUG = -O0 -g
-CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
 CFLAGS += $(DEBUG)
 DEFINES =  -D UNITY_OUTPUT_CHAR=putcharSpy
 DEFINES += -D UNITY_SUPPORT_64 -D UNITY_INCLUDE_DOUBLE -D UNITY_NO_WEAK