diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
index 212946d45..007457d40 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -1,23 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:id="@+id/action_debug"
-        android:checkable="true"
-        android:icon="@android:drawable/ic_menu_info_details"
-        android:title="@string/action_debug" />
+    <item android:id="@+id/mainActivityMenu"
+          android:title="@string/navdrawer_menu_title_mainactivity_controls">
+        <menu>
+            <group>
+                <item
+                    android:id="@+id/action_debug"
+                    android:checkable="true"
+                    android:icon="@android:drawable/ic_menu_info_details"
+                    android:title="@string/action_debug" />
 
-    <item
-        android:id="@+id/action_markers"
-        android:checkable="true"
-        android:icon="@android:drawable/ic_menu_myplaces"
-        android:title="@string/action_point_annotations" />
+                <item
+                    android:id="@+id/action_markers"
+                    android:checkable="true"
+                    android:icon="@android:drawable/ic_menu_myplaces"
+                    android:title="@string/action_point_annotations" />
 
-    <item
-        android:id="@+id/action_compass"
-        android:checkable="true"
-        android:icon="@android:drawable/ic_menu_compass"
-        android:title="@string/action_compass" />
+                <item
+                    android:id="@+id/action_compass"
+                    android:checkable="true"
+                    android:icon="@android:drawable/ic_menu_compass"
+                    android:title="@string/action_compass" />
+            </group>
+        </menu>
+    </item>
+
+    <group android:id="@+id/stylesSeparator" />
+
+    <item android:id="@+id/mainActivityStylesMenue"
+        android:title="@string/navdrawer_menu_title_mainactivity_styles">
+        <menu>
+            <group
+                android:id="@+id/stylesGroup"
+                android:checkableBehavior="single"
+                android:enabled="true">
+                <item
+                    android:id="@+id/actionStyleMapboxStreets"
+                    android:title="@string/styleMapboxStreets" />
+
+                <item
+                    android:id="@+id/actionStyleEmerald"
+                    android:title="@string/styleEmerald" />
+
+                <item
+                    android:id="@+id/actionStyleLight"
+                    android:title="@string/styleLight" />
+
+                <item
+                    android:id="@+id/actionStyleDark"
+                    android:title="@string/styleDark" />
+
+                <item
+                    android:id="@+id/actionStyleSatellite"
+                    android:title="@string/styleSatellite" />
+
+            </group>
+        </menu>
+    </item>
 
     <!--
         <group android:id="@+id/locationFollowModesSeparator"/>
@@ -32,44 +72,24 @@
         </group>
     -->
 
-    <group android:id="@+id/stylesSeparator" />
 
-    <group
-        android:id="@+id/stylesGroup"
-        android:checkableBehavior="single">
+    <group android:id="@+id/testsSeparator"/>
 
-        <item
-            android:id="@+id/actionStyleMapboxStreets"
-            android:title="@string/styleMapboxStreets" />
+    <item android:id="@+id/testsMenu"
+        android:title="@string/navdrawer_menu_title_individual_tests">
+        <menu>
+            <item
+                android:id="@+id/action_info_window_adapter"
+                android:checkable="false"
+                android:icon="@drawable/ic_filter_none_white_24dp"
+                android:title="@string/action_info_window_adapter" />
 
-        <item
-            android:id="@+id/actionStyleEmerald"
-            android:title="@string/styleEmerald" />
-
-        <item
-            android:id="@+id/actionStyleLight"
-            android:title="@string/styleLight" />
-
-        <item
-            android:id="@+id/actionStyleDark"
-            android:title="@string/styleDark" />
-
-        <item
-            android:id="@+id/actionStyleSatellite"
-            android:title="@string/styleSatellite" />
-
-    </group>
-
-    <item
-        android:id="@+id/action_info_window_adapter"
-        android:checkable="false"
-        android:icon="@drawable/ic_filter_none_white_24dp"
-        android:title="@string/action_info_window_adapter" />
-
-    <item
-        android:id="@+id/action_map_fragment"
-        android:checkable="false"
-        android:icon="@drawable/ic_widgets_white_24dp"
-        android:title="@string/action_map_fragment" />
+            <item
+                android:id="@+id/action_map_fragment"
+                android:checkable="false"
+                android:icon="@drawable/ic_widgets_white_24dp"
+                android:title="@string/action_map_fragment" />
+        </menu>
+    </item>
 
 </menu>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 637e5ca45..e3e8d38ad 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -6,6 +6,9 @@
     <string name="activity_infowindow_adapter">InfoWindow Adapter</string>
     <string name="activity_map_fragment">Map Fragment Activity</string>
 
+    <string name="navdrawer_menu_title_mainactivity_controls">Main Activity Controls</string>
+    <string name="navdrawer_menu_title_mainactivity_styles">Main Activity Styles</string>
+    <string name="navdrawer_menu_title_individual_tests">Individual Tests</string>
     <string name="action_gps">Toggle GPS location</string>
     <string name="action_location_none">Disable tracking</string>
     <string name="action_location_follow">Use follow tracking mode</string>