diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index d73ce2069a..c58f993fe7 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -136,7 +136,6 @@ diff-cover==0.7.3
 django-crum==0.5
 django_nose==1.3
 factory_boy==2.2.1
-flaky==1.1.0
 freezegun==0.1.11
 lettuce==0.2.20
 mock-django==0.6.6
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index a4a8f8b1e8..e0b2b7030d 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -11,6 +11,7 @@
 -e git+https://github.com/edx/django-pipeline.git@88ec8a011e481918fdc9d2682d4017c835acd8be#egg=django-pipeline
 -e git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki
 -e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-2#egg=django-oauth2-provider
+-e git+https://github.com/clytwynec/flaky.git@clytwynec/fix-false-success-results#egg=flaky
 -e git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=mongodb_proxy
 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
 -e git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk