diff --git a/.travis.yml b/.travis.yml
index 417be14..4f5076a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,177 +10,93 @@ addons:
 jobs:
   include:
     - stage: analyze
-      name: "SDK: dev; PKG: command_line; TASKS: `dartanalyzer .`"
+      name: "SDK: dev; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartanalyzer .`"
       dart: dev
       os: linux
-      env: PKGS="command_line"
-      script: ./tool/travis.sh dartanalyzer
-    - stage: analyze
-      name: "SDK: stable; PKG: command_line; TASKS: `dartanalyzer .`"
-      dart: stable
-      os: linux
-      env: PKGS="command_line"
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartanalyzer
     - stage: analyze
-      name: "SDK: dev; PKG: command_line; TASKS: `dartfmt -n --set-exit-if-changed .`"
-      dart: dev
-      os: linux
-      env: PKGS="command_line"
-      script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: stable; PKG: command_line; TASKS: `dartfmt -n --set-exit-if-changed .`"
-      dart: stable
-      os: linux
-      env: PKGS="command_line"
-      script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: dev; PKG: extension_methods; TASKS: `dartanalyzer .`"
+      name: "SDK: dev; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartanalyzer .`"
       dart: dev
-      os: linux
-      env: PKGS="extension_methods"
-      script: ./tool/travis.sh dartanalyzer
-    - stage: analyze
-      name: "SDK: stable; PKG: extension_methods; TASKS: `dartanalyzer .`"
-      dart: stable
-      os: linux
-      env: PKGS="extension_methods"
+      os: osx
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartanalyzer
     - stage: analyze
-      name: "SDK: dev; PKG: extension_methods; TASKS: `dartfmt -n --set-exit-if-changed .`"
+      name: "SDK: dev; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartanalyzer .`"
       dart: dev
-      os: linux
-      env: PKGS="extension_methods"
-      script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: stable; PKG: extension_methods; TASKS: `dartfmt -n --set-exit-if-changed .`"
-      dart: stable
-      os: linux
-      env: PKGS="extension_methods"
-      script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: dev; PKG: ffi/hello_world; TASKS: `dartanalyzer .`"
-      dart: dev
-      os: linux
-      env: PKGS="ffi/hello_world"
+      os: windows
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartanalyzer
     - stage: analyze
-      name: "SDK: stable; PKG: ffi/hello_world; TASKS: `dartanalyzer .`"
+      name: "SDK: stable; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartanalyzer .`"
       dart: stable
       os: linux
-      env: PKGS="ffi/hello_world"
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartanalyzer
     - stage: analyze
-      name: "SDK: dev; PKG: ffi/hello_world; TASKS: `dartfmt -n --set-exit-if-changed .`"
-      dart: dev
-      os: linux
-      env: PKGS="ffi/hello_world"
-      script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: stable; PKG: ffi/hello_world; TASKS: `dartfmt -n --set-exit-if-changed .`"
+      name: "SDK: stable; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartanalyzer .`"
       dart: stable
-      os: linux
-      env: PKGS="ffi/hello_world"
-      script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: dev; PKG: ffi/primitives; TASKS: `dartanalyzer .`"
-      dart: dev
-      os: linux
-      env: PKGS="ffi/primitives"
+      os: osx
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartanalyzer
     - stage: analyze
-      name: "SDK: stable; PKG: ffi/primitives; TASKS: `dartanalyzer .`"
+      name: "SDK: stable; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartanalyzer .`"
       dart: stable
-      os: linux
-      env: PKGS="ffi/primitives"
+      os: windows
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartanalyzer
     - stage: analyze
-      name: "SDK: dev; PKG: ffi/primitives; TASKS: `dartfmt -n --set-exit-if-changed .`"
+      name: "SDK: dev; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartfmt -n --set-exit-if-changed .`"
       dart: dev
       os: linux
-      env: PKGS="ffi/primitives"
-      script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: stable; PKG: ffi/primitives; TASKS: `dartfmt -n --set-exit-if-changed .`"
-      dart: stable
-      os: linux
-      env: PKGS="ffi/primitives"
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartfmt
     - stage: analyze
-      name: "SDK: dev; PKG: ffi/structs; TASKS: `dartanalyzer .`"
+      name: "SDK: dev; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartfmt -n --set-exit-if-changed .`"
       dart: dev
-      os: linux
-      env: PKGS="ffi/structs"
-      script: ./tool/travis.sh dartanalyzer
-    - stage: analyze
-      name: "SDK: stable; PKG: ffi/structs; TASKS: `dartanalyzer .`"
-      dart: stable
-      os: linux
-      env: PKGS="ffi/structs"
-      script: ./tool/travis.sh dartanalyzer
+      os: osx
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
+      script: ./tool/travis.sh dartfmt
     - stage: analyze
-      name: "SDK: dev; PKG: ffi/structs; TASKS: `dartfmt -n --set-exit-if-changed .`"
+      name: "SDK: dev; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartfmt -n --set-exit-if-changed .`"
       dart: dev
-      os: linux
-      env: PKGS="ffi/structs"
+      os: windows
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartfmt
     - stage: analyze
-      name: "SDK: stable; PKG: ffi/structs; TASKS: `dartfmt -n --set-exit-if-changed .`"
+      name: "SDK: stable; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartfmt -n --set-exit-if-changed .`"
       dart: stable
       os: linux
-      env: PKGS="ffi/structs"
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartfmt
     - stage: analyze
-      name: "SDK: dev; PKG: ffi/system-command; TASKS: `dartanalyzer .`"
-      dart: dev
-      os: linux
-      env: "PKGS=\"ffi/system-command\""
-      script: ./tool/travis.sh dartanalyzer
-    - stage: analyze
-      name: "SDK: stable; PKG: ffi/system-command; TASKS: `dartanalyzer .`"
+      name: "SDK: stable; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartfmt -n --set-exit-if-changed .`"
       dart: stable
-      os: linux
-      env: "PKGS=\"ffi/system-command\""
-      script: ./tool/travis.sh dartanalyzer
-    - stage: analyze
-      name: "SDK: dev; PKG: ffi/system-command; TASKS: `dartfmt -n --set-exit-if-changed .`"
-      dart: dev
-      os: linux
-      env: "PKGS=\"ffi/system-command\""
+      os: osx
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartfmt
     - stage: analyze
-      name: "SDK: stable; PKG: ffi/system-command; TASKS: `dartfmt -n --set-exit-if-changed .`"
+      name: "SDK: stable; PKGS: command_line, extension_methods, ffi/hello_world, ffi/primitives, ffi/structs, ffi/system-command, native_app; TASKS: `dartfmt -n --set-exit-if-changed .`"
       dart: stable
-      os: linux
-      env: "PKGS=\"ffi/system-command\""
+      os: windows
+      env: "PKGS=\"command_line extension_methods ffi/hello_world ffi/primitives ffi/structs ffi/system-command native_app\""
       script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: dev; PKG: native_app; TASKS: `dartanalyzer .`"
+    - stage: unit_test
+      name: "SDK: dev; PKG: command_line; TASKS: `pub run test`"
       dart: dev
       os: linux
-      env: PKGS="native_app"
-      script: ./tool/travis.sh dartanalyzer
-    - stage: analyze
-      name: "SDK: stable; PKG: native_app; TASKS: `dartanalyzer .`"
-      dart: stable
-      os: linux
-      env: PKGS="native_app"
-      script: ./tool/travis.sh dartanalyzer
-    - stage: analyze
-      name: "SDK: dev; PKG: native_app; TASKS: `dartfmt -n --set-exit-if-changed .`"
+      env: PKGS="command_line"
+      script: ./tool/travis.sh test
+    - stage: unit_test
+      name: "SDK: dev; PKG: command_line; TASKS: `pub run test`"
       dart: dev
-      os: linux
-      env: PKGS="native_app"
-      script: ./tool/travis.sh dartfmt
-    - stage: analyze
-      name: "SDK: stable; PKG: native_app; TASKS: `dartfmt -n --set-exit-if-changed .`"
-      dart: stable
-      os: linux
-      env: PKGS="native_app"
-      script: ./tool/travis.sh dartfmt
+      os: osx
+      env: PKGS="command_line"
+      script: ./tool/travis.sh test
     - stage: unit_test
       name: "SDK: dev; PKG: command_line; TASKS: `pub run test`"
       dart: dev
-      os: linux
+      os: windows
       env: PKGS="command_line"
       script: ./tool/travis.sh test
     - stage: unit_test
@@ -189,18 +105,54 @@ jobs:
       os: linux
       env: PKGS="command_line"
       script: ./tool/travis.sh test
+    - stage: unit_test
+      name: "SDK: stable; PKG: command_line; TASKS: `pub run test`"
+      dart: stable
+      os: osx
+      env: PKGS="command_line"
+      script: ./tool/travis.sh test
+    - stage: unit_test
+      name: "SDK: stable; PKG: command_line; TASKS: `pub run test`"
+      dart: stable
+      os: windows
+      env: PKGS="command_line"
+      script: ./tool/travis.sh test
     - stage: unit_test
       name: "SDK: dev; PKG: extension_methods; TASKS: `pub run test`"
       dart: dev
       os: linux
       env: PKGS="extension_methods"
       script: ./tool/travis.sh test
+    - stage: unit_test
+      name: "SDK: dev; PKG: extension_methods; TASKS: `pub run test`"
+      dart: dev
+      os: osx
+      env: PKGS="extension_methods"
+      script: ./tool/travis.sh test
+    - stage: unit_test
+      name: "SDK: dev; PKG: extension_methods; TASKS: `pub run test`"
+      dart: dev
+      os: windows
+      env: PKGS="extension_methods"
+      script: ./tool/travis.sh test
     - stage: unit_test
       name: "SDK: stable; PKG: extension_methods; TASKS: `pub run test`"
       dart: stable
       os: linux
       env: PKGS="extension_methods"
       script: ./tool/travis.sh test
+    - stage: unit_test
+      name: "SDK: stable; PKG: extension_methods; TASKS: `pub run test`"
+      dart: stable
+      os: osx
+      env: PKGS="extension_methods"
+      script: ./tool/travis.sh test
+    - stage: unit_test
+      name: "SDK: stable; PKG: extension_methods; TASKS: `pub run test`"
+      dart: stable
+      os: windows
+      env: PKGS="extension_methods"
+      script: ./tool/travis.sh test
     - stage: unit_test
       name: "SDK: dev; PKG: ffi/hello_world; TASKS: `pub run test`"
       dart: dev
diff --git a/command_line/mono_pkg.yaml b/command_line/mono_pkg.yaml
index bdfede7..6af24e4 100644
--- a/command_line/mono_pkg.yaml
+++ b/command_line/mono_pkg.yaml
@@ -2,9 +2,14 @@ dart:
   - dev
   - stable
 
+os:
+  - linux
+  - osx
+  - windows
+
 stages:
   - analyze:
     - dartanalyzer
     - dartfmt
   - unit_test:
-      - test
+    - test
diff --git a/extension_methods/mono_pkg.yaml b/extension_methods/mono_pkg.yaml
index 1140426..6af24e4 100644
--- a/extension_methods/mono_pkg.yaml
+++ b/extension_methods/mono_pkg.yaml
@@ -2,9 +2,14 @@ dart:
   - dev
   - stable
 
+os:
+  - linux
+  - osx
+  - windows
+
 stages:
   - analyze:
-      - dartanalyzer
-      - dartfmt
+    - dartanalyzer
+    - dartfmt
   - unit_test:
-      - test
+    - test
diff --git a/ffi/hello_world/mono_pkg.yaml b/ffi/hello_world/mono_pkg.yaml
index bdfede7..da70e69 100644
--- a/ffi/hello_world/mono_pkg.yaml
+++ b/ffi/hello_world/mono_pkg.yaml
@@ -2,9 +2,16 @@ dart:
   - dev
   - stable
 
+os:
+  - linux
+  - osx
+  - windows
+
 stages:
   - analyze:
     - dartanalyzer
     - dartfmt
   - unit_test:
-      - test
+    - test:
+      os:
+        - linux
diff --git a/ffi/primitives/mono_pkg.yaml b/ffi/primitives/mono_pkg.yaml
index 1140426..da70e69 100644
--- a/ffi/primitives/mono_pkg.yaml
+++ b/ffi/primitives/mono_pkg.yaml
@@ -2,9 +2,16 @@ dart:
   - dev
   - stable
 
+os:
+  - linux
+  - osx
+  - windows
+
 stages:
   - analyze:
-      - dartanalyzer
-      - dartfmt
+    - dartanalyzer
+    - dartfmt
   - unit_test:
-      - test
+    - test:
+      os:
+        - linux
diff --git a/ffi/structs/mono_pkg.yaml b/ffi/structs/mono_pkg.yaml
index b7f81f6..729d419 100644
--- a/ffi/structs/mono_pkg.yaml
+++ b/ffi/structs/mono_pkg.yaml
@@ -2,6 +2,11 @@ dart:
   - dev
   - stable
 
+os:
+  - linux
+  - osx
+  - windows
+
 stages:
   - analyze:
     - dartanalyzer
diff --git a/ffi/system-command/mono_pkg.yaml b/ffi/system-command/mono_pkg.yaml
index b7f81f6..729d419 100644
--- a/ffi/system-command/mono_pkg.yaml
+++ b/ffi/system-command/mono_pkg.yaml
@@ -2,6 +2,11 @@ dart:
   - dev
   - stable
 
+os:
+  - linux
+  - osx
+  - windows
+
 stages:
   - analyze:
     - dartanalyzer
diff --git a/mono_repo.yaml b/mono_repo.yaml
index a924196..cfbffb4 100644
--- a/mono_repo.yaml
+++ b/mono_repo.yaml
@@ -3,3 +3,7 @@ travis:
     apt:
       packages:
         - cmake
+
+# Merges all analyze stages into one bot, which is more efficient
+merge_stages:
+  - analyze
diff --git a/native_app/mono_pkg.yaml b/native_app/mono_pkg.yaml
index b7f81f6..729d419 100644
--- a/native_app/mono_pkg.yaml
+++ b/native_app/mono_pkg.yaml
@@ -2,6 +2,11 @@ dart:
   - dev
   - stable
 
+os:
+  - linux
+  - osx
+  - windows
+
 stages:
   - analyze:
     - dartanalyzer