diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java b/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java
index 7d4653eaa4..4f018c67a6 100644
--- a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java
+++ b/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java
@@ -185,6 +185,11 @@ public class KeyboardPickerTest {
       Intent actual = Shadows.shadowOf(activity).getNextStartedActivity();
       Assert.assertNotNull(actual);
 
+      if(_controller!=null) {
+        _controller.pause().stop().destroy();
+        _controller = null;
+      }
+
       _controller2 = Robolectric.buildActivity(KeyboardInfoActivity.class,actual).setup();
       KeyboardInfoActivity _info = _controller2.get();
       Assert.assertNotNull(_info);