diff --git a/scripts/setup.sh b/scripts/setup.sh
index e01265f..401fd91 100644
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -155,7 +155,7 @@ do
     # standard for build time and memory consumption, see
     # https://github.com/JuliaCI/PackageEvaluator.jl/issues/83
     # The log for adding the package will go in the results folder.
-    timeout -s 9 2000s julia -e "Pkg.add(\"${PKGNAME}\")" 2>&1 | tee PKGEVAL_${PKGNAME}_add.log
+    timeout -s 9 1800s julia -e "Pkg.add(\"${PKGNAME}\")" 2>&1 | tee PKGEVAL_${PKGNAME}_add.log
     # A package can have four states:
     # - Not testable: for some reason, we can't even analyze how
     #   broken or not the package is, usually due to a limitation
diff --git a/src/preptest.jl b/src/preptest.jl
index eb32e65..5a86678 100644
--- a/src/preptest.jl
+++ b/src/preptest.jl
@@ -38,7 +38,7 @@ function prepare_test()
     if get(PKGOPTS, pkg_name, :NORMAL) == :XVFB
         print(fp, "xvfb-run ")
     end
-    print(fp, "$TIMEOUTPATH -s 9 1080s ")
+    print(fp, "$TIMEOUTPATH -s 9 900s ")
     print(fp, "julia -e 'versioninfo(true); Pkg.test(\"", pkg_name, "\")'")
     print(fp, " 2>&1 | tee PKGEVAL_", pkg_name, "_test.log")
     close(fp)