diff --git a/.travis.yml b/.travis.yml
index e74699e..9e32fed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,3 +9,10 @@ matrix:
   include:
     - elixir: 1.7
       otp_release: 21.0
+env:
+  - MIX_ENV=test
+script:
+  - mix dialyzer
+  - mix coveralls.travis
+  - mix credo --strict
+  - mix test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ba9024..c23b284 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [1.6.X]
 - Update type names and docs for consistent naming convention (Note: there is no logic or method name change)
+- Update the Travis script to prevent breaks on merges:
+- - Include dialyzer warnings
+- - Include coverage
+- - Include credo checks
 
 ## [1.5.X]
 - Fix Elixir `v1.7.x` warnings for string to atom conversions
diff --git a/mix.exs b/mix.exs
index ce475ae..e0b491d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -46,7 +46,7 @@ defmodule EventBus.Mixfile do
   defp deps do
     [
       {:credo, "~> 0.10", only: [:dev, :test]},
-      {:dialyxir, "~> 1.0.0-rc.3", only: [:dev], runtime: false},
+      {:dialyxir, "~> 1.0.0-rc.3", only: [:dev, :test], runtime: false},
       {:excoveralls, "~> 0.10", only: [:test]},
       {:ex_doc, "~> 0.19", only: [:dev]}
     ]