diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
index 39c1a4cd8..3fdc20a35 100644
--- a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
+++ b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java
@@ -107,7 +107,8 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen
     if (lastAccuracySensorStatus == SensorManager.SENSOR_STATUS_UNRELIABLE) {
       Logger.d(TAG, "Compass sensor is unreliable, device calibration is needed.");
       // Update the heading, even if the sensor is unreliable.
-      // This makes it possible to use a different indicator for the unreliable case, instead of just changing the RenderMode to NORMAL.
+      // This makes it possible to use a different indicator for the unreliable case,
+      // instead of just changing the RenderMode to NORMAL.
       //return;
     }
     if (event.sensor.getType() == Sensor.TYPE_ROTATION_VECTOR) {
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java b/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java
index bebd82811..0ff562a43 100644
--- a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java
+++ b/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/CompassEngineTest.java
@@ -58,7 +58,6 @@ public class CompassEngineTest {
   @Test
   public void whenGyroscopeIsNull_fallbackToGravity() {
     SensorManager sensorManager = mock(SensorManager.class);
-    when(sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE)).thenReturn(null);
     new LocationComponentCompassEngine(windowManager, sensorManager);
 
     verify(sensorManager, times(1)).getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
@@ -67,7 +66,6 @@ public class CompassEngineTest {
   @Test
   public void whenGyroscopeIsNull_fallbackToMagneticField() {
     SensorManager sensorManager = mock(SensorManager.class);
-    when(sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE)).thenReturn(null);
     new LocationComponentCompassEngine(windowManager, sensorManager);
 
     verify(sensorManager, times(1)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);