Merge from upstream

1 files changed, 1 insertions, 2 deletions

diff --git a/scripts/travis.sh b/scripts/travis.sh
index ae4a9f926..49b7233e1 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -12,7 +12,6 @@ killall -q peertube || true
 if [ "$1" = "misc" ]; then
     npm run build -- --light-fr
     mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/client.ts \
-        server/tests/activitypub.ts \
         server/tests/feeds/index.ts \
         server/tests/misc-endpoints.ts \
         server/tests/helpers/index.ts
@@ -31,7 +30,7 @@ elif [ "$1" = "api-2" ]; then
 elif [ "$1" = "api-3" ]; then
     npm run build:server
     mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-3.ts
-elif [ "$1" = "api-3" ]; then
+elif [ "$1" = "api-4" ]; then
     npm run build:server
     mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-4.ts
 elif [ "$1" = "lint" ]; then