--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSessionOOMSave.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSessionOOMSave.java
@@ -14,16 +14,20 @@ public class testSessionOOMSave extends 
 
     private HomeConfig.Editor mEditor;
     private String mDefaultPanelId;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
+        // Having the Activity Stream home panel active during this test seems to cause relatively
+        // frequent intermittent crashes, so for now, we avoid loading it by setting a different
+        // default panel for this test (bug 1396324).
+        // TODO: Remove the workaround once crashes have been fixed (bug 1398532).
         final HomeConfig homeConfig = HomeConfig.getDefault(getInstrumentation().getTargetContext());
         final HomeConfig.State state = homeConfig.load();
         mEditor = state.edit();
         mDefaultPanelId = mEditor.getDefaultPanelId();
         mEditor.setDefault(HomeConfig.getIdForBuiltinPanelType(HomeConfig.PanelType.BOOKMARKS));
         mEditor.apply();
     }