diff --git a/.gitignore b/.gitignore
index 99a5221..e2f0c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 ext/packaging
 /pkg/
+
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..6aae178
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+---
+language: ruby
+bundler_args: --without development
+script: "bundle exec rake test SPEC_OPTS='--format documentation'"
+rvm:
+  - 1.8.7
+  - 1.9.3
+env:
+  matrix:
+    - MCOLLECTIVE_GEM_VERSION ="~> 2.2.0"
+    - MCOLLECTIVE_GEM_VERSION ="~> 2.4.0"
+    - MCOLLECTIVE_GEM_VERSION ="~> 2.5.0"
+notifications:
+  email: false
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..4e87a57
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,17 @@
+#!ruby
+source 'https://rubygems.org'
+
+group :test do
+  gem 'rake'
+  gem 'rspec', '~> 2.11.0'
+  gem 'mocha', '~> 0.10.0'
+  gem 'mcollective-test'
+end
+
+mcollective_version = ENV['MCOLLECTIVE_GEM_VERSION']
+
+if mcollective_version
+  gem 'mcollective-client', mcollective_version, :require => false
+else
+  gem 'mcollective-client', :require => false
+end