diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt
new file mode 100644
index 000000000000..6260897da44d
--- /dev/null
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt
@@ -0,0 +1,218 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+package org.mozilla.geckoview.test
+
+import org.mozilla.geckoview.StorageController
+
+import android.support.test.filters.MediumTest
+import android.support.test.runner.AndroidJUnit4
+import org.hamcrest.Matchers.*
+import org.json.JSONObject
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class StorageControllerTest : BaseSessionTest() {
+
+    @Test fun clearData() {
+        sessionRule.session.loadUri("https://example.com")
+        sessionRule.waitForPageStop()
+
+        sessionRule.session.evaluateJS("""
+            localStorage.setItem('ctx', 'test');
+            document.cookie = 'ctx=test';
+        """)
+
+        var localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        var cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("test"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("ctx=test"))
+
+        sessionRule.waitForResult(
+            sessionRule.runtime.storageController.clearData(
+                StorageController.ClearFlags.ALL))
+
+        localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("null"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("null"))
+    }
+
+    @Test fun clearDataFlags() {
+        sessionRule.session.loadUri("https://example.com")
+        sessionRule.waitForPageStop()
+
+        sessionRule.session.evaluateJS("""
+            localStorage.setItem('ctx', 'test');
+            document.cookie = 'ctx=test';
+        """)
+
+        var localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        var cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("test"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("ctx=test"))
+
+        sessionRule.waitForResult(
+            sessionRule.runtime.storageController.clearData(
+                StorageController.ClearFlags.COOKIES))
+
+        localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("test"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("null"))
+
+        sessionRule.session.evaluateJS("""
+            document.cookie = 'ctx=test';
+        """)
+
+        sessionRule.waitForResult(
+            sessionRule.runtime.storageController.clearData(
+                StorageController.ClearFlags.DOM_STORAGES))
+
+        localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("null"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("ctx=test"))
+
+        sessionRule.session.evaluateJS("""
+            localStorage.setItem('ctx', 'test');
+        """)
+
+        sessionRule.waitForResult(
+            sessionRule.runtime.storageController.clearData(
+                StorageController.ClearFlags.SITE_DATA))
+
+        localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("null"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("null"))
+    }
+
+    @Test fun clearDataFromHost() {
+        sessionRule.session.loadUri("https://example.com")
+        sessionRule.waitForPageStop()
+
+        sessionRule.session.evaluateJS("""
+            localStorage.setItem('ctx', 'test');
+            document.cookie = 'ctx=test';
+        """)
+
+        var localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        var cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("test"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("ctx=test"))
+
+        sessionRule.waitForResult(
+            sessionRule.runtime.storageController.clearDataFromHost(
+                "test.com",
+                StorageController.ClearFlags.ALL))
+
+        localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("test"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("ctx=test"))
+
+        sessionRule.waitForResult(
+            sessionRule.runtime.storageController.clearDataFromHost(
+                "example.com",
+                StorageController.ClearFlags.ALL))
+
+        localStorage = sessionRule.session.evaluateJS("""
+            localStorage.getItem('ctx') || 'null'
+        """) as String
+
+        cookie = sessionRule.session.evaluateJS("""
+            document.cookie || 'null'
+        """) as String
+
+        assertThat("Local storage value should match",
+                   localStorage,
+                   equalTo("null"))
+        assertThat("Cookie value should match",
+                   cookie,
+                   equalTo("null"))
+    }
+}