diff --git a/.travis.yml b/.travis.yml
index 1c005422c9..81642a2d64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,9 @@ matrix:
       rvm: 2.0.0
 
 before_install:
+  - export HOMEBREW_NO_AUTO_UPDATE=1
   - export HOMEBREW_DEVELOPER=1
+  - git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       HOMEBREW_REPOSITORY="$(brew --repo)";
       sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps";
@@ -24,7 +26,10 @@ before_install:
       sudo rm -rf "$HOMEBREW_REPOSITORY";
       sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY";
     else
+      git fetch --unshallow;
       export PATH="$PWD/bin:$PATH";
+      rm -rf Library/Taps/homebrew/homebrew-test-bot/.git;
+      mv Library/Taps/homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-core;
       umask 022;
     fi
 
diff --git a/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz b/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz
deleted file mode 100644
index 83f7ab1dde..0000000000
Binary files a/Library/Homebrew/test/support/fixtures/tarballs/testbottest-0.1.tbz and /dev/null differ
diff --git a/Library/Homebrew/test/support/fixtures/testbottest.rb b/Library/Homebrew/test/support/fixtures/testbottest.rb
deleted file mode 100644
index f7695cab5b..0000000000
--- a/Library/Homebrew/test/support/fixtures/testbottest.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Testbottest < Formula
-  desc "Minimal C program and Makefile used for testing Homebrew."
-  homepage "https://github.com/Homebrew/brew"
-  url "file://#{File.expand_path("..", __FILE__)}/tarballs/testbottest-0.1.tbz"
-  sha256 "78b54d8f31585c9773bed12b4aa4ab2ce458ebd044b9406cb24d40aa5107f082"
-
-  def install
-    system "make", "install", "PREFIX=#{prefix}"
-  end
-
-  test do
-    assert_equal "testbottest\n", shell_output("#{bin}/testbottest")
-  end
-end