diff --git a/run-ib-addon.py b/run-ib-addon.py
index 8fba7480de11..b86cf946c63d 100755
--- a/run-ib-addon.py
+++ b/run-ib-addon.py
@@ -9,7 +9,7 @@
   exit(1)
 
 logger = LogUpdater(environ["CMSSW_BASE"])
-ret = doCmd('cd '+environ["CMSSW_BASE"]+'; rm -rf addOnTests; addOnTests.py -j '+str(cmsRunProcessCount)+' 2>&1 >addOnTests.log ')
+ret = doCmd('cd '+environ["CMSSW_BASE"]+'; rm -rf addOnTests; timeout 5400 addOnTests.py -j '+str(cmsRunProcessCount)+' 2>&1 >addOnTests.log ')
 doCmd('cd '+environ["CMSSW_BASE"]+'/addOnTests/logs; zip -r addOnTests.zip *.log')
 logger.updateAddOnTestsLogs()
 
diff --git a/run-pr-tests b/run-pr-tests
index ce5792522fd6..187eaf5c7342 100755
--- a/run-pr-tests
+++ b/run-pr-tests
@@ -587,7 +587,7 @@ fi
 if [ "X$DO_ADDON_TESTS" = Xtrue -a "X$BUILD_OK" = Xtrue ]; then
   $CMS_BOT_DIR/report-pull-request-results TESTS_RUNNING --repo $PUB_REPO --pr $PULL_REQUEST_NUMBER -c $LAST_COMMIT --pr-job-id ${BUILD_NUMBER} --add-message "Running AddOn Tests" $DRY_RUN
   echo '--------------------------------------'
-  ADDON_CMD="addOnTests.py -j $(Jenkins_GetCPU) "
+  ADDON_CMD="timeout 5400 addOnTests.py -j $(Jenkins_GetCPU) "
   echo $ADDON_CMD > $WORKSPACE/addOnTests.log
   (eval $ADDON_CMD && echo 'ALL_OK') 2>&1 | tee -a $WORKSPACE/addOnTests.log
   echo 'END OF ADDON TESTS'