1 files changed, 16 insertions, 5 deletions
diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
index c3741fdef..f85523eb7 100644
--- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
+++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
@@ -17,12 +17,14 @@
 
 package org.sufficientlysecure.keychain;
 
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.LargeTest;
 import android.text.method.HideReturnsTransformationMethod;
 import android.text.method.PasswordTransformationMethod;
 
-import org.junit.Rule;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity;
@@ -44,15 +46,24 @@ import static org.sufficientlysecure.keychain.matcher.EditTextMatchers.withError
 import static org.sufficientlysecure.keychain.matcher.EditTextMatchers.withTransformationMethod;
 
 @RunWith(AndroidJUnit4.class)
-public class CreateKeyActivityTest {
+@LargeTest
+public class CreateKeyActivityTest extends ActivityInstrumentationTestCase2<CreateKeyActivity> {
 
     public static final String SAMPLE_NAME = "Sample Name";
     public static final String SAMPLE_EMAIL = "sample_email@gmail.com";
     public static final String SAMPLE_ADDITIONAL_EMAIL = "sample_additional_email@gmail.com";
     public static final String SAMPLE_PASSWORD = "sample_password";
 
-    @Rule
-    public ActivityTestRule<CreateKeyActivity> mActivityRule = new ActivityTestRule<>(CreateKeyActivity.class);
+    public CreateKeyActivityTest() {
+        super(CreateKeyActivity.class);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        injectInstrumentation(InstrumentationRegistry.getInstrumentation());
+        getActivity();
+    }
 
     @Test
     public void testCreateMyKey() {