diff --git a/.travis.yml b/.travis.yml
index 71974caa6..cc4d361a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,8 @@ script:
   - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" | sudo tee -a /usr/local/android-sdk/licenses/android-sdk-license
   - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" | sudo tee -a /usr/local/android-sdk/licenses/android-sdk-license
   - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" | sudo tee -a /usr/local/android-sdk/licenses/android-sdk-license
-  # Run tests but don't complain just because some fail.
-  # TODO: Change this once we get all the tests passing.
-  - (./gradlew -q testDebug 2>&1 || true) | tee testlog.txt
-  # Fail if more tests fail than we think should
-  - '[[ $(cat testlog.txt | grep ''tests completed'' | sed ''s/.* \([0-9]*\) failed.*/\1/g'') -le 5 ]]'
+  # Run tests
+  - ./gradlew -q testDebug 2>&1
   # Make sure a release build builds
   - ./gradlew assembleForkRelease -PversionName="$(git describe --tags HEAD)"
   
diff --git a/README.md b/README.md
index b792aef75..048d5f34b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Iceweasel Mobile!
+# Iceweasel Mobile! [![Build Status](https://travis-ci.org/fork-maintainers/iceweasel.svg?branch=fork)](https://travis-ci.org/fork-maintainers/iceweasel)
 Definitely not brought to you by Mozilla!
 
 Iceweasel Mobile is a web browser for Android, based on [Mozilla's Fenix version of Firefox](https://github.com/mozilla-mobile/fenix/), [GeckoView](https://mozilla.github.io/geckoview/) and [Mozilla Android Components](https://mozac.org/).
diff --git a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingHeaderViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingHeaderViewHolderTest.kt
index f29821142..e5ca76626 100644
--- a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingHeaderViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingHeaderViewHolderTest.kt
@@ -29,6 +29,6 @@ class OnboardingHeaderViewHolderTest {
     fun `bind header text`() {
         OnboardingHeaderViewHolder(view)
 
-        assertEquals("Welcome to Firefox Preview!", view.header_text.text)
+        assertEquals("Welcome to Iceweasel Preview!", view.header_text.text)
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolderTest.kt
index b1e128432..32d6ce7de 100644
--- a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingWhatsNewViewHolderTest.kt
@@ -56,7 +56,7 @@ class OnboardingWhatsNewViewHolderTest {
         OnboardingWhatsNewViewHolder(view, interactor)
 
         assertEquals(
-            "Have questions about the redesigned Firefox Preview? Want to know what’s changed?",
+            "Have questions about the redesigned Iceweasel Preview? Want to know what’s changed?",
             view.description_text.text
         )
 
diff --git a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
index ace841db6..b538412c8 100644
--- a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
@@ -31,6 +31,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.R
@@ -82,6 +83,7 @@ class ShareControllerTest {
         verify { dismiss(ShareController.Result.DISMISSED) }
     }
 
+    @Ignore("Intermittently failing; will be fixed with #9212 and #8725.")
     @Test
     fun `handleShareToApp should start a new sharing activity and close this`() = runBlocking {
         val appPackageName = "package"
diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/SyncedTabsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/SyncedTabsControllerTest.kt
index 6ff967c84..cbb800656 100644
--- a/app/src/test/java/org/mozilla/fenix/tabtray/SyncedTabsControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabtray/SyncedTabsControllerTest.kt
@@ -69,7 +69,7 @@ class SyncedTabsControllerTest {
     }
 
     @Test
-    fun `display synced tabs in reverse`() {
+    fun `display synced tabs in correct order`() {
         val tabs = listOf(
             SyncedDeviceTabs(
                 device = mockk(relaxed = true),
@@ -88,19 +88,19 @@ class SyncedTabsControllerTest {
         assertEquals(4, itemCount)
         assertEquals(
             SyncedTabsViewHolder.TitleViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(itemCount - 1)
+            controller.adapter.getItemViewType(0)
         )
         assertEquals(
             SyncedTabsViewHolder.DeviceViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(itemCount - 2)
+            controller.adapter.getItemViewType(1)
         )
         assertEquals(
             SyncedTabsViewHolder.TabViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(itemCount - 3)
+            controller.adapter.getItemViewType(2)
         )
         assertEquals(
             SyncedTabsViewHolder.TabViewHolder.LAYOUT_ID,
-            controller.adapter.getItemViewType(itemCount - 4)
+            controller.adapter.getItemViewType(3)
         )
     }
 
@@ -128,6 +128,6 @@ class SyncedTabsControllerTest {
 
         store.dispatch(ExitMultiSelectMode).joinBlocking()
 
-        verify { concatAdapter.addAdapter(0, any()) }
+        verify { concatAdapter.addAdapter(any()) }
     }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt
index 1c461a4f2..4c3a9e9c9 100644
--- a/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt
@@ -62,7 +62,7 @@ class TabTrayViewHolderTest {
         tabViewHolder.bind(tab, false, mockk(), mockk())
 
         assertEquals("m".repeat(MAX_URI_LENGTH), tabViewHolder.urlView?.text)
-        verify { imageLoader.loadIntoView(any(), ImageLoadRequest("123", 92)) }
+        verify { imageLoader.loadIntoView(any(), ImageLoadRequest("123", 130)) }
     }
 
     @Test