diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml
index 222082c4ab..e5b9443a6b 100644
--- a/.github/workflows/everything.yml
+++ b/.github/workflows/everything.yml
@@ -93,7 +93,7 @@ jobs:
 
   linux_ubuntu:
     needs: [format, git_checks]
-    if: needs.git_checks.outputs.num_code_changes > 0
+    if: false
 
     runs-on: ubuntu-20.04
     container:
@@ -144,7 +144,7 @@ jobs:
 
   linux_el8:
     needs: [format, git_checks]
-    if: needs.git_checks.outputs.num_code_changes > 0
+    if: false
 
     runs-on: ubuntu-latest
     container:
@@ -185,7 +185,7 @@ jobs:
 
   macos:
     needs: [format, git_checks]
-    if: needs.git_checks.outputs.num_code_changes > 0
+    if: false
 
     runs-on: ${{ matrix.image }}
     env:
diff --git a/testing/adios2/engine/staging-common/CMakeLists.txt b/testing/adios2/engine/staging-common/CMakeLists.txt
index 9fdcea85c7..228ede3437 100644
--- a/testing/adios2/engine/staging-common/CMakeLists.txt
+++ b/testing/adios2/engine/staging-common/CMakeLists.txt
@@ -378,7 +378,7 @@ if(NOT MSVC AND ADIOS2_HAVE_HDF5 AND (NOT ADIOS2_HAVE_MPI OR HDF5_IS_PARALLEL))
 endif()
 
 # Tests particularities
-if (WIN32)
+if (MSVC)
     set_property(TEST Staging.1x1DefSync.BP5 PROPERTY TIMEOUT 500)
     set_property(TEST Staging.1x1DataWrite.BP5 PROPERTY TIMEOUT 500)
 endif()
diff --git a/testing/adios2/engine/staging-common/TestSupp.cmake b/testing/adios2/engine/staging-common/TestSupp.cmake
index 24b71902b3..4c7beaacae 100644
--- a/testing/adios2/engine/staging-common/TestSupp.cmake
+++ b/testing/adios2/engine/staging-common/TestSupp.cmake
@@ -70,10 +70,10 @@ set (1x1GetSync_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --rarg=--read_mode --rarg
 set (1x1DontCloseWriter_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --warg=--dont_close")
 set (1x1DontCloseReader_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --rarg=--dont_close")
 set (1x1DefSync_CMD "TestDefSyncWrite --data_size 200 --engine_params ChunkSize=500,MinDeferredSize=150")
-set (1x1DefSync_TIMEOUT 180)
+set (1x1DefSync_TIMEOUT 500)
 set (1x1VarDestruction_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --rarg=--var_destruction")
 set (1x1DataWrite_CMD "TestDefSyncWrite --flush --data_size 200 --engine_params ChunkSize=500,MinDeferredSize=150")
-set (1x1DataWrite_TIMEOUT 180)
+set (1x1DataWrite_TIMEOUT 500)
 set (1x1.NoPreload_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --rarg=PreloadMode=SstPreloadNone,RENGINE_PARAMS")
 set (1x1.SstRUDP_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --rarg=DataTransport=WAN,WANDataTransport=enet,RENGINE_PARAMS --warg=DataTransport=WAN,WANDataTransport=enet,WENGINE_PARAMS")
 set (1x1.NoData_CMD "run_test.py.$<CONFIG> -nw 1 -nr 1 --warg=--no_data --rarg=--no_data")