diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 53c16f56f..57d0bbb39 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -1,30 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mapbox.mapboxsdk.testapp">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:fullBackupContent="true"
         android:icon="@drawable/icon_burned"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
         <activity
-            android:name="com.mapbox.mapboxsdk.testapp.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".InfoWindowAdapterActivity" android:label="@string/activity_second"/>
+
+        <activity
+            android:name=".InfoWindowAdapterActivity"
+            android:label="@string/activity_infowindow_adapter" />
+
+        <activity
+            android:name=".MapFragmentActivity"
+            android:label="@string/activity_map_fragment" />
+
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="9724157045ff7d083492c6d9ae03e60e8609d461" />
+
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
index b794c89ca..7b4e49514 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
@@ -34,9 +34,6 @@ import com.mapbox.mapboxsdk.views.MapView;
 
 import io.fabric.sdk.android.Fabric;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -285,7 +282,7 @@ public class MainActivity extends AppCompatActivity {
                                 menuItem.setChecked(mMapView.isCompassEnabled());
                                 return true;
 
-                            case R.id.action_second_map_activity:
+                            case R.id.action_info_window_adapter:
                                 startActivity(new Intent(getApplicationContext(), InfoWindowAdapterActivity.class));
                                 return true;
 
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
new file mode 100644
index 000000000..578908b94
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
@@ -0,0 +1,42 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.mapbox.mapboxsdk.views.MapView;
+
+public class MapFragmentActivity extends AppCompatActivity {
+
+    private static final String TAG_FRAGMENT = "map";
+    private MyMapFragment mMapFragment;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_map_fragment);
+
+        if (savedInstanceState == null) {
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            transaction.add(R.id.fragment_container, mMapFragment = new MyMapFragment(), TAG_FRAGMENT);
+            transaction.commit();
+        } else {
+            mMapFragment = (MyMapFragment) getSupportFragmentManager().findFragmentByTag(TAG_FRAGMENT);
+        }
+    }
+
+    public static class MyMapFragment extends MapFragment {
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            Context context = view.getContext();
+
+            MapView map = getMap();
+            map.setAccessToken(Util.getAccessToken(context));
+            map.setStyleUrl(MapView.StyleUrls.EMERALD);
+        }
+    }
+}
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
new file mode 100644
index 000000000..c78d51248
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.mapbox.mapboxsdk.testapp.MapFragmentActivity"/>
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 091df65e6..fc232f84f 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -61,9 +61,15 @@
     </group>
 
     <item
-        android:id="@+id/action_second_map_activity"
+        android:id="@+id/action_info_window_adapter"
         android:checkable="false"
         android:icon="@drawable/ic_looks_two_white_24dp"
         android:title="@string/action_info_window_adapter" />
 
+    <item
+        android:id="@+id/action_map_fragment"
+        android:checkable="false"
+        android:icon="@drawable/ic_looks_two_white_24dp"
+        android:title="@string/action_map_fragment" />
+
 </menu>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index a723e64aa..637e5ca45 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -3,7 +3,8 @@
 
     <string name="app_name">Mapbox GL</string>
 
-    <string name="activity_second">Second Activity</string>
+    <string name="activity_infowindow_adapter">InfoWindow Adapter</string>
+    <string name="activity_map_fragment">Map Fragment Activity</string>
 
     <string name="action_gps">Toggle GPS location</string>
     <string name="action_location_none">Disable tracking</string>
@@ -13,6 +14,7 @@
     <string name="action_debug">Toggle debug mode</string>
     <string name="action_point_annotations">Toggle point annotations</string>
     <string name="action_info_window_adapter">InfoWindow Adapter</string>
+    <string name="action_map_fragment">MapFragment</string>
 
     <string name="label_fps">FPS:</string>