diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/BadCrosswordDataInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/BadCrosswordDataInstrumentedTest.kt
index b5de3c7e..ecafbcee 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/BadCrosswordDataInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/BadCrosswordDataInstrumentedTest.kt
@@ -1,7 +1,9 @@
 package com.example.crosswordToLearn
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 import java.io.File
 import java.io.FileOutputStream
@@ -9,6 +11,10 @@ import java.io.FileOutputStream
 @RunWith(AndroidJUnit4::class)
 class BadCrosswordDataInstrumentedTest : BadCrosswordDataTest() {
 
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
     override fun spoil() {
         File(getContext().filesDir, "${crossword.title}${GameActivity.DATA_SUFFIX}").apply {
             FileOutputStream(this).use {
@@ -17,7 +23,7 @@ class BadCrosswordDataInstrumentedTest : BadCrosswordDataTest() {
         }
     }
 
-    @Test(timeout = 30000)
+    @Test
     fun badCrosswordDataInstrumentedTest() {
         test()
     }
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/BadCrosswordStateInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/BadCrosswordStateInstrumentedTest.kt
index f8fd8d02..27ff1005 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/BadCrosswordStateInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/BadCrosswordStateInstrumentedTest.kt
@@ -5,7 +5,9 @@ import com.example.crosswordToLearn.BadCrosswordDataTest
 import com.example.crosswordToLearn.GameActivity
 import com.example.crosswordToLearn.getContext
 import com.example.crosswordToLearn.getTestContext
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 import java.io.File
 import java.io.FileOutputStream
@@ -13,6 +15,10 @@ import java.io.FileOutputStream
 @RunWith(AndroidJUnit4::class)
 class BadCrosswordStateInstrumentedTest : BadCrosswordDataTest() {
 
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
     override fun spoil() {
         File(getContext().filesDir, "${crossword.title}${GameActivity.STATE_SUFFIX}").apply {
             FileOutputStream(this).use {
@@ -21,7 +27,7 @@ class BadCrosswordStateInstrumentedTest : BadCrosswordDataTest() {
         }
     }
 
-    @Test(timeout = 30000)
+    @Test
     fun badCrosswordStateInstrumentedTest() {
         test()
     }
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/BadImageReadingInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/BadImageReadingInstrumentedTest.kt
index 0caa918a..961f05b0 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/BadImageReadingInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/BadImageReadingInstrumentedTest.kt
@@ -11,6 +11,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 import java.io.File
 import java.io.FileOutputStream
@@ -22,6 +23,10 @@ class BadImageReadingInstrumentedTest {
     @JvmField
     val retryTestRule = RetryTestRule()
 
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
     @Before
     fun addBadData() {
         if (Environment.getExternalStorageState() == Environment.MEDIA_MOUNTED) {
@@ -51,7 +56,7 @@ class BadImageReadingInstrumentedTest {
 
     private lateinit var scenario: ActivityScenario<ChooseTopicsActivity>
 
-    @Test(timeout = 30000)
+    @Test
     fun badImageReadingInstrumentedTest(){
         Intent(
                 ApplicationProvider.getApplicationContext(),
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/ChooseTopicsInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/ChooseTopicsInstrumentedTest.kt
index cd2fb8d9..5f490582 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/ChooseTopicsInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/ChooseTopicsInstrumentedTest.kt
@@ -2,18 +2,14 @@ package com.example.crosswordToLearn
 
 
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.IdlingPolicies
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.FlakyTest
-
-
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
@@ -27,13 +23,17 @@ class ChooseTopicsInstrumentedTest {
     @JvmField
     val retryTestRule = RetryTestRule()
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun chooseTopicsInstrumentedTest() {
         chooseGenerateCrossword()
         onView(isRoot()).perform(waitForView(withId(R.id.ok_play)))
         onView(withId(R.id.ok_play)).perform(click())
         onView(withText(R.string.choose_at_least_one_topic)).inRoot(ToastMatcher.isToast()).check(
-            matches(isDisplayed())
+                matches(isDisplayed())
         )
     }
 }
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/DeleteCrosswordAfterSolveInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/DeleteCrosswordAfterSolveInstrumentedTest.kt
index 39bbc697..9243554e 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/DeleteCrosswordAfterSolveInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/DeleteCrosswordAfterSolveInstrumentedTest.kt
@@ -5,13 +5,19 @@ import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.RootMatchers
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class DeleteCrosswordAfterSolveInstrumentedTest : SolveCrossword(){
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun deleteCrosswordAfterSolveInstrumentedTest() {
         val crossword1 = generateCrossword()
         crossword = generateCrossword()
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/DeleteCrosswordInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/DeleteCrosswordInstrumentedTest.kt
index 436be530..f3d7e05d 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/DeleteCrosswordInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/DeleteCrosswordInstrumentedTest.kt
@@ -5,7 +5,9 @@ import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.RootMatchers
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
@@ -17,7 +19,11 @@ import org.junit.runner.RunWith
 // doesn't fit crossword.
 class DeleteCrosswordInstrumentedTest : SolveCrossword() {
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun deleteCrosswordInstrumentedTest() {
         crossword = generateCrossword()
         generateCrossword()
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/ImpossibleToBuildInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/ImpossibleToBuildInstrumentedTest.kt
index 2c7597b2..79198ac9 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/ImpossibleToBuildInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/ImpossibleToBuildInstrumentedTest.kt
@@ -1,13 +1,19 @@
 package com.example.crosswordToLearn
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class ImpossibleToBuildInstrumentedTest : ChoseTopicsToastTest() {
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun impossibleToBuildInstrumentedTest() {
         choseTopicsImpl(
             "impossibleToBuild.json",
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsBecauseTooLongInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsBecauseTooLongInstrumentedTest.kt
index de9c0cc5..9601fb8e 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsBecauseTooLongInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsBecauseTooLongInstrumentedTest.kt
@@ -1,13 +1,19 @@
 package com.example.crosswordToLearn
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class NotEnoughWordsBecauseTooLongInstrumentedTest : ChoseTopicsToastTest() {
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun notEnoughWordsBecauseTooLongInstrumentedTest() {
         choseTopicsImpl(
                 "tooLongWordsData.json", getContext().getString(
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsBecauseTooShortInstrumentedTests.kt b/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsBecauseTooShortInstrumentedTests.kt
index f6c021a9..e69afbbf 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsBecauseTooShortInstrumentedTests.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsBecauseTooShortInstrumentedTests.kt
@@ -1,13 +1,19 @@
 package com.example.crosswordToLearn
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class NotEnoughWordsBecauseTooShortInstrumentedTests : ChoseTopicsToastTest() {
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun notEnoughWordsBecauseTooShortInstrumentedTests() {
         choseTopicsImpl(
                 "tooShortWordsData.json", getContext().getString(
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsInstrumentedTest.kt
index da299765..e8c816bf 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/NotEnoughWordsInstrumentedTest.kt
@@ -1,13 +1,19 @@
 package com.example.crosswordToLearn
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class NotEnoughWordsInstrumentedTest : ChoseTopicsToastTest() {
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun notEnoughWordsInstrumentedTest() {
         choseTopicsImpl(
             "notEnoughWords.json", getContext().getString(
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordAfterResetInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordAfterResetInstrumentedTest.kt
index bac0c2a9..499f19d7 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordAfterResetInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordAfterResetInstrumentedTest.kt
@@ -5,13 +5,19 @@ import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.RootMatchers
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class SolveCrosswordAfterResetInstrumentedTest : SolveCrossword() {
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun solveCrosswordAfterResetInstrumentedTest() {
         crossword = generateCrossword()
         loadFirstCrossword()
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordInstrumentedTest.kt
index 31137fbf..bf96c0fb 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordInstrumentedTest.kt
@@ -1,13 +1,19 @@
 package com.example.crosswordToLearn
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class SolveCrosswordInstrumentedTest : SolveCrossword() {
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun solveCrosswordInstrumentedTest() {
         crossword = generateCrossword()
         loadFirstCrossword()
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordWithTipsInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordWithTipsInstrumentedTest.kt
index 5d2193d4..05263da8 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordWithTipsInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/SolveCrosswordWithTipsInstrumentedTest.kt
@@ -14,6 +14,7 @@ import org.akop.ararat.core.Crossword
 import org.hamcrest.core.AnyOf.anyOf
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
@@ -27,6 +28,10 @@ class SolveCrosswordWithTipsInstrumentedTest {
     @JvmField
     val retryTestRule = RetryTestRule()
 
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
     private fun menuClick(name: Int, id: Int, price: Int): Int {
         var stars = readConfig()
         openActionBarOverflowOrOptionsMenu(
@@ -42,7 +47,7 @@ class SolveCrosswordWithTipsInstrumentedTest {
         return stars
     }
 
-    @Test(timeout = 30000)
+    @Test
     fun solveCrosswordWithTipsInstrumentedTest() {
         val crossword = generateCrossword()
         loadFirstCrossword()
diff --git a/app/src/androidTest/java/com/example/crosswordToLearn/SolvedCrosswordAfterFillInstrumentedTest.kt b/app/src/androidTest/java/com/example/crosswordToLearn/SolvedCrosswordAfterFillInstrumentedTest.kt
index 6285803b..20fb3c85 100644
--- a/app/src/androidTest/java/com/example/crosswordToLearn/SolvedCrosswordAfterFillInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/crosswordToLearn/SolvedCrosswordAfterFillInstrumentedTest.kt
@@ -4,13 +4,19 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.Timeout
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class SolvedCrosswordAfterFillInstrumentedTest : SolveCrossword() {
 
-    @Test(timeout = 30000)
+    @Rule
+    @JvmField
+    var timeout: Timeout = Timeout.millis(30000)
+
+    @Test
     fun solvedCrosswordAfterFillInstrumentedTest() {
         crossword = generateCrossword()
         loadFirstCrossword()