diff --git a/.travis.yml b/.travis.yml
index b84c4b6b..24de1484 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,20 +2,19 @@
 language: ruby
 bundler_args: --without development
 before_install: rm Gemfile.lock || true
-sudo: false
+sudo: true
 rvm:
-#  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
-script: bundle exec rake test
+script: if [[ $BEAKER == true ]]; then make beaker; else bundle exec rake test; fi
 env:
-#  - PUPPET_VERSION="~> 2.7.0"
   - PUPPET_VERSION="~> 3.1.0"
   - PUPPET_VERSION="~> 3.3.0"
   - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.0.0"
   - PUPPET_VERSION="~> 4.1.0"
+  - BEAKER=true
 matrix:
   exclude:
   - rvm: 1.9.3
@@ -42,3 +41,7 @@ matrix:
     env: PUPPET_VERSION="~> 4.1.0"
   - rvm: 2.0.0
     env: PUPPET_VERSION="~> 4.1.0"
+  - rvm: 1.9.3
+    env: BEAKER=true
+  - rvm: 2.0.0
+    env: BEAKER=true
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..e1ae2be2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+# Make target for TravisCI to run beaker tests in docker
+beaker:
+	bundle config
+	rm .bundle/config
+	bundle config
+	bundle install
+	curl -sLo - http://j.mp/install-travis-docker | UML_DOCKERCOMPOSE=0 UML_FIG=0 sh -e
+	./run 'bundle exec rake beaker'
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index ff433af5..ee89a824 100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -3,7 +3,6 @@ HOSTS:
     platform: ubuntu-12.04-x64
     image: solarkennedy/ubuntu-12.04-puppet
     hypervisor: docker
-    #docker_cmd: /usr/sbin/sshd -D
     docker_cmd: '["/sbin/init"]' 
     docker_preserve_image: true
 CONFIG: