mozilla-services · Natim · Mar 2, 2016 · Feb 12, 2016 · Mar 2, 2016
diff --git a/CHANGELOG b/CHANGELOG
@@ -6,7 +6,7 @@ This document describes changes between each past release.
 0.20.0 (unreleased)
 -------------------
 
-- No changes yet.
+- Remove loads v1 loadtests.
 
 
 0.19.2 (2016-01-07)

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ NODE_LOCAL_BIN=./node_modules/.bin
 test: lint cover-mocha spaceleft
 
 .PHONY: travis
-travis: lint separate-tests loadtests-check
+travis: lint separate-tests
 
 separate-tests:
 	@env NODE_ENV=test ./node_modules/mocha/bin/mocha test/* --reporter spec -ig websocket
@@ -52,12 +52,6 @@ spaceleft:
 runserver:
 	@env NODE_ENV=${NODE_ENV} node loop/index.js
 
-loadtests-check:
-	@env NODE_ENV=loadtest node loop/index.js & PID=$$!; \
-	  sleep 1 && cd loadtests && \
-	  make test SERVER_URL=http://127.0.0.1:5000; \
-	  EXIT_CODE=$$?; kill $$PID; exit $$EXIT_CODE
-
 .PHONY: circus
 circus:
 	circusd circus/loop-server.ini
diff --git a/README.md b/README.md
@@ -83,6 +83,12 @@ value is high enough or you will get EMFILE errors:
 ulimit -S -n 2048
 ```
 
+## How do I run the loadtests?
+
+The loadtests are in the
+[ailoads-loop](https://github.com/mozilla-services/ailoads-loop)
+repository.
+
 ## Where do I report bugs?
 
 You should report bugs/issues or feature requests via [the loop-server bugzilla

diff --git a/loadtests/Makefile b/loadtests/Makefile
diff --git a/loadtests/config/bench.ini b/loadtests/config/bench.ini
diff --git a/loadtests/config/megabench.ini b/loadtests/config/megabench.ini
diff --git a/loadtests/config/smoke.ini b/loadtests/config/smoke.ini
diff --git a/loadtests/config/test.ini b/loadtests/config/test.ini
diff --git a/loadtests/loadtest/__init__.py b/loadtests/loadtest/__init__.py
diff --git a/loadtests/loadtest/calls.py b/loadtests/loadtest/calls.py