diff --git a/deployment_scripts/puppet/manifests/.gitignore b/deployment_scripts/puppet/manifests/.gitignore
index b844b143d..25e75852c 100644
--- a/deployment_scripts/puppet/manifests/.gitignore
+++ b/deployment_scripts/puppet/manifests/.gitignore
@@ -1 +1,2 @@
 Gemfile.lock
+.bundle
diff --git a/deployment_scripts/puppet/modules/heka/.gitignore b/deployment_scripts/puppet/modules/heka/.gitignore
index afce13850..b766602a0 100644
--- a/deployment_scripts/puppet/modules/heka/.gitignore
+++ b/deployment_scripts/puppet/modules/heka/.gitignore
@@ -1,3 +1,4 @@
 spec/fixtures/modules/*
 spec/fixtures/manifests/*
 Gemfile.lock
+.bundle
diff --git a/deployment_scripts/puppet/modules/lma_collector/.gitignore b/deployment_scripts/puppet/modules/lma_collector/.gitignore
index 9587fdc15..cf17e0370 100644
--- a/deployment_scripts/puppet/modules/lma_collector/.gitignore
+++ b/deployment_scripts/puppet/modules/lma_collector/.gitignore
@@ -2,3 +2,4 @@ spec/fixtures/modules/*
 spec/fixtures/manifests/*
 Gemfile.lock
 tests/lua/mocks/date_time.lua
+.bundle
diff --git a/tox.ini b/tox.ini
index 0bb7de8aa..c0bf5d10b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,11 +11,9 @@ changedir = {toxinidir}/deployment_scripts/puppet/manifests
 whitelist_externals =
     bundle
     mkdir
-setenv =
-    GEM_HOME={toxinidir}/.bundled_gems
 commands =
     mkdir -p {toxinidir}/.bundled_gems
-    bundle install
+    bundle install --path {toxinidir}/.bundled_gems
     bundle exec rake test
 
 [testenv:heka]
@@ -24,11 +22,9 @@ changedir = {toxinidir}/deployment_scripts/puppet/modules/{envname}
 whitelist_externals =
     bundle
     mkdir
-setenv =
-    GEM_HOME={toxinidir}/.bundled_gems
 commands =
     mkdir -p {toxinidir}/.bundled_gems
-    bundle install
+    bundle install --path {toxinidir}/.bundled_gems
     bundle exec rake test
 
 [testenv:lma_collector]
@@ -37,11 +33,9 @@ changedir = {toxinidir}/deployment_scripts/puppet/modules/{envname}
 whitelist_externals =
     bundle
     mkdir
-setenv =
-    GEM_HOME={toxinidir}/.bundled_gems
 commands =
     mkdir -p {toxinidir}/.bundled_gems
-    bundle install
+    bundle install --path {toxinidir}/.bundled_gems
     bundle exec rake test
 
 [testenv:docs]
@@ -51,8 +45,13 @@ commands =
     make clean html SPHINXOPTS=-W
 
 [testenv:build_plugin]
+changedir = {toxinidir}
 whitelist_externals =
     fpb
+    rm
 commands =
+    rm -rf .build
+    rm -rf repositories/ubuntu/*.deb
+    rm -rf repositories/centos/*.rpm
     fpb --check {toxinidir} --debug
     fpb --build {toxinidir} --debug