diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
index 08ccba132b72eb438e8e8b19eaa4fbd295967129..33375a73faacd6cd1a47286b2da588d536f3fab1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
@@ -37,67 +37,67 @@ atlas_add_component( SCT_ConditionsAlgorithms
 
 atlas_add_test( TestCalibChipRead
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testCalibChipRead.py
-                PROPERTIES TIMEOUT 500
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestCalibRead
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testCalibRead.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestConfig
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testConfig.py
-                PROPERTIES TIMEOUT 500
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestDCSConditions
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testDCSConditions.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestLinkMasking
                 SCRIPT share/TestLinkMasking.sh
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestMajority
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testMajority.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestModuleVeto
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testModuleVeto.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestMonRead
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testMonRead.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestParameters
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testParameters.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestReadout
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testReadout.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestRodVeto
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testRodVeto.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestSensors
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testSensors.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestSilicon
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testSilicon.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestStripVeto
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testStripVeto.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestSummary
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testSummary.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 atlas_add_test( TestTdaqEnabled
                 SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testTdaqEnabled.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 
 # Install files from the package:
diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/CMakeLists.txt
index 60c22296c5fb0a17e43a90cf95fa0584dabc8bf4..a9ea09ee3f556660117dc687a5a996572263f347 100644
--- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/CMakeLists.txt
@@ -34,7 +34,7 @@ atlas_add_component( SCT_ModuleDistortions
 
 atlas_add_test( TestSCT_DistortionsTool
                 SCRIPT athena.py --threads=5 SCT_ModuleDistortions/TestSCT_DistortionsTool.py
-                PROPERTIES TIMEOUT 300
+                PROPERTIES TIMEOUT 600
                 ENVIRONMENT THREADS=5 )
 
 # Install files from the package: