2 files changed, 8 insertions, 5 deletions
diff --git a/sdksandbox/tests/testutils/testscenario/example/sdk/src/sdksandbox/testutils/testscenario/example/sdk/ExampleSandboxTest.java b/sdksandbox/tests/testutils/testscenario/example/sdk/src/sdksandbox/testutils/testscenario/example/sdk/ExampleSandboxTest.java
index 50f75f03a2..112182cd59 100644
--- a/sdksandbox/tests/testutils/testscenario/example/sdk/src/sdksandbox/testutils/testscenario/example/sdk/ExampleSandboxTest.java
+++ b/sdksandbox/tests/testutils/testscenario/example/sdk/src/sdksandbox/testutils/testscenario/example/sdk/ExampleSandboxTest.java
@@ -27,4 +27,7 @@ public class ExampleSandboxTest extends SdkSandboxTestScenarioRunner {
     public void testExample() {
         assertTrue(true);
     }
+
+    @Override
+    public void cleanUpOnTestFinish() {}
 }
diff --git a/sdksandbox/tests/testutils/testscenario/example/tests/src/sdksandbox/testutils/testscenario/example/ExampleSandboxTest.java b/sdksandbox/tests/testutils/testscenario/example/tests/src/sdksandbox/testutils/testscenario/example/ExampleSandboxTest.java
index 9ac8ff5e99..a88f7dd63d 100644
--- a/sdksandbox/tests/testutils/testscenario/example/tests/src/sdksandbox/testutils/testscenario/example/ExampleSandboxTest.java
+++ b/sdksandbox/tests/testutils/testscenario/example/tests/src/sdksandbox/testutils/testscenario/example/ExampleSandboxTest.java
@@ -20,18 +20,18 @@ import android.app.sdksandbox.testutils.testscenario.SdkSandboxScenarioRule;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Rule;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class ExampleSandboxTest {
-    @Rule
-    public final SdkSandboxScenarioRule scenario =
+    @ClassRule
+    public static final SdkSandboxScenarioRule sScenario =
             new SdkSandboxScenarioRule("sdksandbox.testutils.testscenario.example.sdk");
 
     @Test
-    public void testExample() throws Exception {
-        scenario.assertSdkTestRunPasses("testExample");
+    public void testExample() throws Throwable {
+        sScenario.assertSdkTestRunPasses("testExample");
     }
 }