diff --git a/src/FileSystem-Tests-Core.package/FileSystemTest.class/class/defaultTimeLimit.st b/src/FileSystem-Tests-Core.package/FileSystemTest.class/class/defaultTimeLimit.st
new file mode 100644
index 00000000000..c1cdbad6ea6
--- /dev/null
+++ b/src/FileSystem-Tests-Core.package/FileSystemTest.class/class/defaultTimeLimit.st
@@ -0,0 +1,3 @@
+accessing
+defaultTimeLimit
+	^10 seconds
\ No newline at end of file
diff --git a/src/SUnit-Core.package/TestCase.class/class/defaultTimeLimit.st b/src/SUnit-Core.package/TestCase.class/class/defaultTimeLimit.st
index 4cbecc1751d..5548ee89307 100644
--- a/src/SUnit-Core.package/TestCase.class/class/defaultTimeLimit.st
+++ b/src/SUnit-Core.package/TestCase.class/class/defaultTimeLimit.st
@@ -1,3 +1,3 @@
 accessing
 defaultTimeLimit
-	^DefaultTimeLimit ifNil: [DefaultTimeLimit := 1 minutes]
\ No newline at end of file
+	^DefaultTimeLimit ifNil: [DefaultTimeLimit := 10 seconds]
diff --git a/src/SUnit-Core.package/TestExecutionEnvironment.class/instance/watchDogLoopFor..st b/src/SUnit-Core.package/TestExecutionEnvironment.class/instance/watchDogLoopFor..st
index d7de3f42d33..cadb11d1c88 100644
--- a/src/SUnit-Core.package/TestExecutionEnvironment.class/instance/watchDogLoopFor..st
+++ b/src/SUnit-Core.package/TestExecutionEnvironment.class/instance/watchDogLoopFor..st
@@ -9,7 +9,9 @@ watchDogLoopFor: testProcess
 		testCompleted] whileFalse: [ 
 			"this subloop allows to dynamically change time limit and restart watch dog"
 			timeIsGone ifTrue: [
+				"The main purpose of following condition is to ignore timeout when test is under debug.
+				Test process is suspended only when it is debugged"
 				testProcess isSuspended ifFalse: [
 					testProcess signalException: TestTookTooMuchTime new]]	].
-	] repeat.
+	] repeat
 
diff --git a/src/Slot-Tests.package/SlotLayoutEqualityTest.class/class/defaultTimeLimit.st b/src/Slot-Tests.package/SlotLayoutEqualityTest.class/class/defaultTimeLimit.st
new file mode 100644
index 00000000000..c1cdbad6ea6
--- /dev/null
+++ b/src/Slot-Tests.package/SlotLayoutEqualityTest.class/class/defaultTimeLimit.st
@@ -0,0 +1,3 @@
+accessing
+defaultTimeLimit
+	^10 seconds
\ No newline at end of file
diff --git a/src/System-Hashing-Tests.package/SHA256Test.class/instance/testFips180Example3.st b/src/System-Hashing-Tests.package/SHA256Test.class/instance/testFips180Example3.st
index 3d17a684aaa..97cd5f5d930 100644
--- a/src/System-Hashing-Tests.package/SHA256Test.class/instance/testFips180Example3.st
+++ b/src/System-Hashing-Tests.package/SHA256Test.class/instance/testFips180Example3.st
@@ -1,6 +1,7 @@
 testing
 testFips180Example3
 	"This test is a bit slow if the implementation is not making use of extra primitives"
+	self timeLimit: 10 seconds.
 	
 	hash := SHA256 hashMessage: (String new: 1e6 withAll: $a).
 	self assert: hash hex equals: 'cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0'
\ No newline at end of file
diff --git a/src/Zinc-Zodiac.package/ZnHTTPSTests.class/class/defaultTimeLimit.st b/src/Zinc-Zodiac.package/ZnHTTPSTests.class/class/defaultTimeLimit.st
new file mode 100644
index 00000000000..c1cdbad6ea6
--- /dev/null
+++ b/src/Zinc-Zodiac.package/ZnHTTPSTests.class/class/defaultTimeLimit.st
@@ -0,0 +1,3 @@
+accessing
+defaultTimeLimit
+	^10 seconds
\ No newline at end of file