new file mode 100644
--- /dev/null
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt
@@ -0,0 +1,218 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+package org.mozilla.geckoview.test
+
+import org.mozilla.geckoview.GeckoSession
+import org.mozilla.geckoview.GeckoSessionSettings
+
+import android.support.test.filters.MediumTest
+import android.support.test.runner.AndroidJUnit4
+
+import org.hamcrest.Matchers.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class SessionLifecycleTest : BaseSessionTest() {
+
+    @Test fun openWindow_allowNullContext() {
+        sessionRule.session.closeWindow()
+
+        sessionRule.session.openWindow(null)
+        sessionRule.session.reload()
+        sessionRule.session.waitForPageStop()
+    }
+
+    @Test fun openWindow_interleaved() {
+        val session1 = sessionRule.createOpenSession()
+        val session2 = sessionRule.createOpenSession()
+        session1.closeWindow()
+        val session3 = sessionRule.createOpenSession()
+        session2.closeWindow()
+        session3.closeWindow()
+
+        sessionRule.session.reload()
+        sessionRule.session.waitForPageStop()
+    }
+
+    @Test fun openWindow_repeated() {
+        for (i in 1..5) {
+            sessionRule.session.closeWindow()
+            sessionRule.session.openWindow()
+        }
+        sessionRule.session.reload()
+        sessionRule.session.waitForPageStop()
+    }
+
+    @Test fun openWindow_allowCallsWhileClosed() {
+        sessionRule.session.closeWindow()
+
+        sessionRule.session.loadUri(HELLO_HTML_PATH)
+        sessionRule.session.reload()
+
+        sessionRule.session.openWindow()
+        sessionRule.session.waitForPageStops(2)
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun openWindow_throwOnAlreadyOpen() {
+        // Throw exception if retrying to open again; otherwise we would leak the old open window.
+        sessionRule.session.openWindow()
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun setChromeURI_throwOnOpenSession() {
+        sessionRule.session.settings.setString(GeckoSessionSettings.CHROME_URI, "chrome://invalid/path/to.xul")
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun setScreenID_throwOnOpenSession() {
+        sessionRule.session.settings.setInt(GeckoSessionSettings.SCREEN_ID, 42)
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun setUsePrivateMode_throwOnOpenSession() {
+        sessionRule.session.settings.setBoolean(GeckoSessionSettings.USE_PRIVATE_MODE, true)
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun setUseMultiprocess_throwOnOpenSession() {
+        sessionRule.session.settings.setBoolean(
+                GeckoSessionSettings.USE_MULTIPROCESS,
+                !sessionRule.session.settings.getBoolean(GeckoSessionSettings.USE_MULTIPROCESS))
+    }
+
+    @Test fun readFromParcel() {
+        val session = sessionRule.createOpenSession()
+
+        session.toParcel { parcel ->
+            val newSession = sessionRule.createClosedSession()
+            newSession.readFromParcel(parcel)
+
+            assertThat("New session has same settings",
+                       newSession.settings, equalTo(session.settings))
+            assertThat("New session is open", newSession.isOpen, equalTo(true))
+
+            newSession.closeWindow()
+            assertThat("New session can be closed", newSession.isOpen, equalTo(false))
+        }
+
+        sessionRule.session.reload()
+        sessionRule.session.waitForPageStop()
+    }
+
+    @Test(expected = IllegalStateException::class)
+    fun readFromParcel_throwOnAlreadyOpen() {
+        // Throw exception if retrying to open again; otherwise we would leak the old open window.
+        sessionRule.session.toParcel { parcel ->
+            sessionRule.createOpenSession().readFromParcel(parcel)
+        }
+    }
+
+    @Test fun readFromParcel_canLoadPageAfterRead() {
+        val newSession = sessionRule.createClosedSession()
+
+        sessionRule.session.toParcel { parcel ->
+            newSession.readFromParcel(parcel)
+        }
+
+        newSession.reload()
+        newSession.waitForPageStop()
+    }
+
+    @Test fun readFromParcel_closedSession() {
+        val session = sessionRule.createClosedSession()
+
+        session.toParcel { parcel ->
+            val newSession = sessionRule.createClosedSession()
+            newSession.readFromParcel(parcel)
+            assertThat("New session should not be open",
+                       newSession.isOpen, equalTo(false))
+        }
+
+        sessionRule.session.reload()
+        sessionRule.session.waitForPageStop()
+    }
+
+    @Test fun readFromParcel_closedSessionAfterParceling() {
+        val session = sessionRule.createOpenSession()
+
+        session.toParcel { parcel ->
+            session.closeWindow()
+
+            val newSession = sessionRule.createClosedSession()
+            newSession.readFromParcel(parcel)
+            assertThat("New session should not be open",
+                       newSession.isOpen, equalTo(false))
+        }
+
+        sessionRule.session.reload()
+        sessionRule.session.waitForPageStop()
+    }
+
+    @Test fun readFromParcel_closeOpenAndLoad() {
+        val newSession = sessionRule.createClosedSession()
+
+        sessionRule.session.toParcel { parcel ->
+            newSession.readFromParcel(parcel)
+        }
+
+        newSession.closeWindow()
+        newSession.openWindow()
+
+        newSession.reload()
+        newSession.waitForPageStop()
+    }
+
+    @Test fun readFromParcel_allowCallsBeforeUnparceling() {
+        val newSession = sessionRule.createClosedSession()
+
+        newSession.loadTestPath(HELLO_HTML_PATH)
+        newSession.reload()
+
+        sessionRule.session.toParcel { parcel ->
+            newSession.readFromParcel(parcel)
+        }
+        newSession.waitForPageStops(2)
+    }
+
+    @Test fun readFromParcel_chained() {
+        val session1 = sessionRule.createClosedSession()
+        val session2 = sessionRule.createClosedSession()
+        val session3 = sessionRule.createClosedSession()
+
+        sessionRule.session.toParcel { parcel ->
+            session1.readFromParcel(parcel)
+        }
+        session1.toParcel { parcel ->
+            session2.readFromParcel(parcel)
+        }
+        session2.toParcel { parcel ->
+            session3.readFromParcel(parcel)
+        }
+
+        session3.reload()
+        session3.waitForPageStop()
+    }
+
+    @Test fun createFromParcel() {
+        val session = sessionRule.createOpenSession()
+
+        session.toParcel { parcel ->
+            val newSession = sessionRule.wrapSession(
+                    GeckoSession.CREATOR.createFromParcel(parcel))
+
+            assertThat("New session has same settings",
+                       newSession.settings, equalTo(session.settings))
+            assertThat("New session is open", newSession.isOpen, equalTo(true))
+
+            newSession.closeWindow()
+            assertThat("New session can be closed", newSession.isOpen, equalTo(false))
+        }
+
+        sessionRule.session.reload()
+        sessionRule.session.waitForPageStop()
+    }
+}

--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionSettings.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionSettings.java
@@ -166,16 +166,22 @@ public final class GeckoSessionSettings 
         return mBundle;
     }
 
     @Override
     public String toString() {
         return mBundle.toString();
     }
 
+    @Override
+    public boolean equals(final Object other) {
+        return other instanceof GeckoSessionSettings &&
+                mBundle.equals(((GeckoSessionSettings) other).mBundle);
+    }
+
     private <T> boolean valueChangedLocked(final Key<T> key, T value) {
         if (key.initOnly && mSession != null && mSession.isOpen()) {
             throw new IllegalStateException("Read-only property");
         } else if (key.values != null && !key.values.contains(value)) {
             throw new IllegalArgumentException("Invalid value");
         }
 
         final Object old = mBundle.get(key.name);