diff --git a/readthedocs/core/views.py b/readthedocs/core/views.py
index 79740139c..0219502b4 100644
--- a/readthedocs/core/views.py
+++ b/readthedocs/core/views.py
@@ -78,6 +78,7 @@ def github_build(request):
                     version_slug = version.slug
                     log.info("(Github Build) Building %s:%s" % (project.slug, version.slug))
             else:
+                version_slug = 'latest'
                 branch = 'latest'
                 log.info("(Github Build) Building %s:latest" % project.slug)
             #version_pk being None means it will use "latest"
diff --git a/readthedocs/projects/fixtures/test_data.json b/readthedocs/projects/fixtures/test_data.json
index e4cbb1a18..985791bda 100644
--- a/readthedocs/projects/fixtures/test_data.json
+++ b/readthedocs/projects/fixtures/test_data.json
@@ -229,6 +229,19 @@
             "slug": "latest"
         }
     },
+    {
+        "pk": 8,
+        "model": "builds.version",
+        "fields": {
+            "uploaded": false,
+            "built": true,
+            "project": 1,
+            "active": true,
+            "identifier": "awesome",
+            "verbose_name": "awesome",
+            "slug": "awesome"
+        }
+    },
     {
         "pk": 2,
         "model": "builds.version",
diff --git a/readthedocs/rtd_tests/tests/test_post_commit_hooks.py b/readthedocs/rtd_tests/tests/test_post_commit_hooks.py
index 2afb258a8..01e8ac5d4 100644
--- a/readthedocs/rtd_tests/tests/test_post_commit_hooks.py
+++ b/readthedocs/rtd_tests/tests/test_post_commit_hooks.py
@@ -2,11 +2,20 @@ from django.test import TestCase
 import json
 
 from projects.models import Project
+from projects import tasks
 
 class PostCommitTest(TestCase):
     fixtures = ["eric", "test_data"]
 
+    def tearDown(self):
+        tasks.update_docs = self.old_bd
+
     def setUp(self):
+        self.old_bd = tasks.update_docs
+        def mock(*args, **kwargs):
+            print "Mocking for great profit and speed."
+        tasks.update_docs = mock
+
         self.client.login(username='eric', password='test')
         self.payload = {
             "after": "5ad757394b926e5637ffeafe340f952ef48bd270",
@@ -38,7 +47,7 @@ class PostCommitTest(TestCase):
             "pusher": {
                 "name": "none"
                 },
-            "ref": "refs/heads/master",
+            "ref": "refs/heads/awesome",
             "repository": {
                 "created_at": "2011/09/09 14:20:13 -0700",
                 "description": "source code to readthedocs.org",
@@ -84,7 +93,7 @@ class PostCommitTest(TestCase):
         """
         r = self.client.post('/github/', {'payload': json.dumps(self.payload)})
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.content, 'Build Started: master')
+        self.assertEqual(r.content, 'Build Started: awesome')
         self.payload['ref'] = 'refs/heads/not_ok'
         r = self.client.post('/github/', {'payload': json.dumps(self.payload)})
         self.assertEqual(r.status_code, 404)
@@ -104,6 +113,7 @@ class PostCommitTest(TestCase):
         old_default = rtd.default_branch
         rtd.default_branch = 'master'
         rtd.save()
+        self.payload['ref'] = 'refs/heads/master'
 
         r = self.client.post('/github/', {'payload': json.dumps(self.payload)})
         self.assertEqual(r.status_code, 200)