diff --git a/tests/package.json b/tests/package.json
index 9c38a381..8cbba693 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -37,7 +37,7 @@
     "react-native-firebase": "file:..",
     "react-native-simple-toast": "0.0.5",
     "react-native-vector-icons": "^4.0.0",
-    "react-navigation": "^1.0.0-beta.7",
+    "react-navigation": "^1.0.0-beta.9",
     "react-redux": "^5.0.3",
     "redux": "^3.6.0",
     "redux-logger": "^2.8.2",
diff --git a/tests/src/screens/Overview.js b/tests/src/screens/Overview.js
index e52b2a94..4ce6a944 100644
--- a/tests/src/screens/Overview.js
+++ b/tests/src/screens/Overview.js
@@ -13,17 +13,11 @@ class Overview extends React.Component {
   // noinspection JSUnusedGlobalSymbols
   static navigationOptions = {
     title: 'Test Suites',
-    header: () => {
-      return {
-        style: { backgroundColor: '#0288d1' },
-        tintColor: '#ffffff',
-        right: (
-          <View style={{ marginRight: 8 }}>
-            <OverviewControlButton />
-          </View>
-        ),
-      };
-    },
+    headerTintColor: '#ffffff',
+    headerStyle: { backgroundColor: '#0288d1' },
+    headerRight: <View style={{ marginRight: 8 }}>
+      <OverviewControlButton />
+    </View>
   };
 
   /**
diff --git a/tests/src/screens/Suite.js b/tests/src/screens/Suite.js
index 884727df..1758a1eb 100644
--- a/tests/src/screens/Suite.js
+++ b/tests/src/screens/Suite.js
@@ -11,25 +11,19 @@ import TestSuiteControlButton from '../components/TestSuiteControlButton';
 
 class Suite extends React.Component {
 
-  static navigationOptions = {
-    title: ({ state: { params: { title } } }) => {
-      return title;
-    },
-    header: ({ state: { params: { testSuiteId, onlyShowFailingTests } }, setParams }) => {
-      return {
-        style: { backgroundColor: '#0288d1' },
-        tintColor: '#ffffff',
-        right: (
-          <View style={{ flexDirection: 'row', marginRight: 8 }}>
-            <TestSuiteControlButton
-              testSuiteId={testSuiteId}
-              onlyShowFailingTests={onlyShowFailingTests}
-              onFilterChange={setParams}
-            />
-          </View>
-        ),
-      };
-    },
+  static navigationOptions = ({ navigation: { state: { params: { title, testSuiteId, onlyShowFailingTests } }, setParams } }) => {
+    return {
+      title,
+      headerTintColor: '#ffffff',
+      headerStyle: { backgroundColor: '#0288d1' },
+      headerRight: <View style={{ flexDirection: 'row', marginRight: 8 }}>
+        <TestSuiteControlButton
+          testSuiteId={testSuiteId}
+          onlyShowFailingTests={onlyShowFailingTests}
+          onFilterChange={setParams}
+        />
+      </View>,
+    };
   };
 
   /**
diff --git a/tests/src/screens/Test.js b/tests/src/screens/Test.js
index a8e0e233..e716ece1 100644
--- a/tests/src/screens/Test.js
+++ b/tests/src/screens/Test.js
@@ -9,21 +9,15 @@ import TestControlButton from '../components/TestControlButton';
 
 class Test extends React.Component {
 
-  static navigationOptions = {
-    title: ({ state: { params: { title } } }) => {
-      return title;
-    },
-    header: ({ state: { params: { testId } } }) => {
-      return {
-        style: { backgroundColor: '#0288d1' },
-        tintColor: '#ffffff',
-        right: (
-          <View style={{ marginRight: 8 }}>
-            <TestControlButton testId={testId} />
-          </View>
-        ),
-      };
-    },
+  static navigationOptions = ({ navigation: { state: { params: { title, testId } } } }) => {
+    return {
+      title,
+      headerTintColor: '#ffffff',
+      headerStyle: { backgroundColor: '#0288d1' },
+      headerRight: <View style={{ marginRight: 8 }}>
+        <TestControlButton testId={testId} />
+      </View>,
+    };
   };
 
   static renderBanner({ status, time }) {