diff --git a/.ci/config.ctest b/.ci/config.ctest
index 9d8de9f4d0d..071f32f7715 100644
--- a/.ci/config.ctest
+++ b/.ci/config.ctest
@@ -5,7 +5,7 @@ SET (CTEST_BINARY_DIRECTORY $ENV{CTEST_BUILD_DIR}/build)
 
 SET (CTEST_CMAKE_COMMAND "cmake")
 SET (CTEST_BUILD_COMMAND $ENV{CTEST_BUILD_COMMAND})
-SET (CTEST_SITE "travis-ci.org")
+SET (CTEST_SITE "github.com")
 IF ($ENV{TRAVIS_PULL_REQUEST} STREQUAL "false")
   # No pull request
   SET (CTEST_BUILD_NAME "$ENV{TRAVIS_BRANCH} ($ENV{BUILD}) ($ENV{TRAVIS_COMMIT})")
@@ -13,11 +13,7 @@ ELSE()
   SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{BUILD}) ($ENV{TRAVIS_COMMIT})")
 ENDIF()
 SET (CTEST_BUILD_CONFIGURATION "Release")
-IF ($ENV{TRAVIS_CONFIG} STREQUAL "code_layout")
-  SET (CTEST_TEST_TIMEOUT 600) # 600 seconds, spelling test might take some time
-ELSE()
-  SET (CTEST_TEST_TIMEOUT 60) # 60 seconds
-ENDIF()
+SET (CTEST_TEST_TIMEOUT 60) # 60 seconds
 IF(DEFINED ENV{CTEST_PARALLEL_LEVEL})
   SET(PARALLEL_LEVEL $ENV{CTEST_PARALLEL_LEVEL})
 ELSE(DEFINED ENV{CTEST_PARALLEL_LEVEL})
diff --git a/.docker/docker-qgis-test.sh b/.docker/docker-qgis-test.sh
index a35fcb45f0a..27d8dcad393 100755
--- a/.docker/docker-qgis-test.sh
+++ b/.docker/docker-qgis-test.sh
@@ -64,17 +64,23 @@ export QGIS_ORACLETEST_DBNAME="${ORACLE_HOST}/XEPDB1"
 export QGIS_ORACLETEST_DB="host=${QGIS_ORACLETEST_DBNAME} port=1521 user='QGIS' password='qgis'"
 
 echo "Wait a moment while loading Oracle database."
+COUNT=0
 while ! echo exit | sqlplus -L SYSTEM/adminpass@$QGIS_ORACLETEST_DBNAME &> /dev/null
 do
   printf "🙏"
-  sleep 1
+  sleep 3
+  if [[ $(( COUNT++ )) -eq 100 ]]; then
+    break
+  fi
 done
-echo " done 👀"
-
-pushd /root/QGIS > /dev/null
-/root/QGIS/tests/testdata/provider/testdata_oracle.sh $ORACLE_HOST
-popd > /dev/null # /root/QGIS
-
+if [[ ${COUNT} -eq 101 ]]; then
+  echo "timeout, no oracle, no 🙏"
+else
+  echo " done 👀"
+  pushd /root/QGIS > /dev/null
+  /root/QGIS/tests/testdata/provider/testdata_oracle.sh $ORACLE_HOST
+  popd > /dev/null # /root/QGIS
+fi
 # this is proving very flaky:
 
 ##############################