diff --git a/tests/lib_strong/html/indexeddb_1_test.dart b/tests/lib_2/html/indexeddb_1_test.dart
similarity index 100%
rename from tests/lib_strong/html/indexeddb_1_test.dart
rename to tests/lib_2/html/indexeddb_1_test.dart
diff --git a/tests/lib_strong/html/indexeddb_2_test.dart b/tests/lib_2/html/indexeddb_2_test.dart
similarity index 100%
rename from tests/lib_strong/html/indexeddb_2_test.dart
rename to tests/lib_2/html/indexeddb_2_test.dart
diff --git a/tests/lib_strong/html/indexeddb_3_test.dart b/tests/lib_2/html/indexeddb_3_test.dart
similarity index 100%
rename from tests/lib_strong/html/indexeddb_3_test.dart
rename to tests/lib_2/html/indexeddb_3_test.dart
diff --git a/tests/lib_strong/html/indexeddb_4_test.dart b/tests/lib_2/html/indexeddb_4_test.dart
similarity index 100%
rename from tests/lib_strong/html/indexeddb_4_test.dart
rename to tests/lib_2/html/indexeddb_4_test.dart
diff --git a/tests/lib_2/lib_2.status b/tests/lib_2/lib_2.status
index 5e6c183fd2b..58ba9109d4a 100644
--- a/tests/lib_2/lib_2.status
+++ b/tests/lib_2/lib_2.status
@@ -189,12 +189,17 @@ html/element_offset_test/offset: RuntimeError # Issue 18573
 html/element_types_test/supported_meter: RuntimeError # Issue 18573
 html/element_types_test/supported_template: Fail
 html/event_test: RuntimeError # Safarimobilesim does not support WheelEvent
+html/indexeddb_1_test/supported: Fail
 html/performance_api_test/supported: Fail
 html/notification_test: RuntimeError # Issue 22869
 html/performance_api_test/supported: Fail
 html/wheelevent_test: RuntimeError # Safarimobilesim does not support WheelEvent
 
 [ $runtime == safari ]
+html/indexeddb_1_test/functional: Skip # Times out. Issue 21433
+html/indexeddb_2_test: RuntimeError # Issue 21433
+html/indexeddb_4_test: RuntimeError # Issue 21433
+html/indexeddb_3_test: Skip # Times out 1 out of 10.
 html/notification_test: Fail # Safari doesn't let us access the fields of the Notification to verify them.
 html/touchevent_test: Fail # Safari does not support TouchEvents
 
diff --git a/tests/lib_2/lib_2_dart2js.status b/tests/lib_2/lib_2_dart2js.status
index 7387305b98a..e70215b9fd0 100644
--- a/tests/lib_2/lib_2_dart2js.status
+++ b/tests/lib_2/lib_2_dart2js.status
@@ -43,6 +43,10 @@ html/custom/element_upgrade_failure_test: MissingCompileTimeError
 html/custom/entered_left_view_test/shadow_dom: Pass, Timeout # Roll 50 failure
 html/custom_elements_test: Pass, Timeout # Issue 26789
 html/debugger_test: CompileTimeError # Issue 30900
+html/indexeddb_1_test/functional: Pass, Timeout # Roll 50 failure
+html/indexeddb_2_test: Pass, Timeout # Roll 50 failure
+html/indexeddb_3_test: Pass, Timeout # Roll 50 failure
+html/indexeddb_4_test: Pass, Timeout # Roll 50 failure
 html/js_typed_interop_default_arg_test/default_value: MissingCompileTimeError # Issue #25759
 html/js_typed_interop_side_cast_exp_test: Pass, RuntimeError # Roll 50 failure
 html/mirrors_js_typed_interop_test: Pass, Slow
@@ -174,6 +178,10 @@ html/element_types_constructors6_test: Crash # 'file:*/pkg/compiler/lib/src/comm
 html/element_types_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
 html/event_customevent_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
 html/event_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
+html/indexeddb_1_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
+html/indexeddb_2_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
+html/indexeddb_3_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
+html/indexeddb_4_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
 html/js_typed_interop_anonymous2_exp_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
 html/js_typed_interop_anonymous2_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
 html/js_typed_interop_anonymous_exp_test: Crash # 'file:*/pkg/compiler/lib/src/common_elements.dart': Failed assertion: line 405 pos 12: 'element.name == '=='': is not true.
@@ -320,6 +328,14 @@ html/element_types_test/supported_track: RuntimeError
 html/element_types_test: Crash # NoSuchMethodError: Class 'JMethod' has no instance getter 'implementation'.
 html/event_customevent_test: RuntimeError
 html/event_test: RuntimeError
+html/indexeddb_1_test/dynamic: RuntimeError
+html/indexeddb_1_test/functional: RuntimeError
+html/indexeddb_1_test/supported: RuntimeError
+html/indexeddb_1_test/typed: RuntimeError
+html/indexeddb_1_test: Crash # NoSuchMethodError: Class 'JMethod' has no instance getter 'implementation'.
+html/indexeddb_2_test: RuntimeError
+html/indexeddb_3_test: RuntimeError
+html/indexeddb_4_test: RuntimeError
 html/js_typed_interop_anonymous2_exp_test: Crash # NoSuchMethodError: Class 'JMethod' has no instance getter 'implementation'.
 html/js_typed_interop_anonymous2_test: Crash # NoSuchMethodError: Class 'JMethod' has no instance getter 'implementation'.
 html/js_typed_interop_anonymous_exp_test: Crash # NoSuchMethodError: Class 'JMethod' has no instance getter 'implementation'.
diff --git a/tests/lib_2/lib_2_dartdevc.status b/tests/lib_2/lib_2_dartdevc.status
index 1f8881c317b..5b13e98bae7 100644
--- a/tests/lib_2/lib_2_dartdevc.status
+++ b/tests/lib_2/lib_2_dartdevc.status
@@ -53,6 +53,8 @@ html/custom_elements_23127_test: Skip # Issue 29922
 html/custom_elements_test: Skip # Issue 29922
 html/element_classes_test: RuntimeError # Issue 29922
 html/element_classes_svg_test: RuntimeError # Issue 29922
+html/indexeddb_1_test/functional: RuntimeError # Issue 29922, strong mode cast failure
+html/indexeddb_2_test: RuntimeError, Skip # Times out. Issue 29922, strong mode cast failure
 html/js_typed_interop_default_arg_test/default_value: MissingCompileTimeError # Issue 29922
 html/js_typed_interop_side_cast_exp_test/01: RuntimeError # Requires --experimental-trust-js-interop-type-annotations flag.
 html/js_util_test: RuntimeError # Issue 29922
@@ -62,6 +64,8 @@ html/keyboard_event_test: RuntimeError # Issue 30946
 html/media_stream_test: RuntimeError # Issue 29922
 html/mediasource_test: RuntimeError # Issue 29922
 html/transition_event_test: Pass, RuntimeError, Timeout # Issue 29922, this test seems flaky
+html/webgl_extensions_test: RuntimeError # Issue XXX
+html/websql_test: RuntimeError, Pass # Issue 29922
 math/random_big_test: RuntimeError # Issue 29922
 html/webgl_extensions_test: RuntimeError # Issue 31017
 html/websql_test: RuntimeError, Pass # Issue 29922
diff --git a/tests/lib_strong/lib_strong.status b/tests/lib_strong/lib_strong.status
index 5201e00e1b0..00f3e7cc33c 100644
--- a/tests/lib_strong/lib_strong.status
+++ b/tests/lib_strong/lib_strong.status
@@ -109,8 +109,6 @@ html/async_spawnuri_test: RuntimeError # Issue 29922
 html/async_test: RuntimeError # Issue 29922
 html/element_classes_svg_test: RuntimeError # Issue 29922
 html/element_classes_test: RuntimeError # Issue 29922
-html/indexeddb_1_test/functional: RuntimeError # Issue 29922, strong mode cast failure
-html/indexeddb_2_test: RuntimeError, Skip # Times out. Issue 29922, strong mode cast failure
 html/input_element_test: RuntimeError # Issue 29922
 html/interactive_test: Skip # requests interactive permissions (camera, geolocation)
 html/isolates_test: RuntimeError # Issue 29922
diff --git a/tests/lib_strong/lib_strong_kernel.status b/tests/lib_strong/lib_strong_kernel.status
index 3836a03d354..4b259473100 100644
--- a/tests/lib_strong/lib_strong_kernel.status
+++ b/tests/lib_strong/lib_strong_kernel.status
@@ -56,10 +56,6 @@ html/history_test: DartkCompileTimeError
 html/htmlcollection_test: DartkCompileTimeError
 html/htmlelement_test: DartkCompileTimeError
 html/htmloptionscollection_test: DartkCompileTimeError
-html/indexeddb_1_test: DartkCompileTimeError
-html/indexeddb_2_test: DartkCompileTimeError
-html/indexeddb_3_test: DartkCompileTimeError
-html/indexeddb_4_test: DartkCompileTimeError
 html/indexeddb_5_test: DartkCompileTimeError
 html/input_element_test: DartkCompileTimeError
 html/instance_of_test: DartkCompileTimeError