diff --git a/test/functional/android/find_by_image_tests.py b/test/functional/android/find_by_image_tests.py
index 4f3b1273..20b66aee 100644
--- a/test/functional/android/find_by_image_tests.py
+++ b/test/functional/android/find_by_image_tests.py
@@ -31,9 +31,9 @@ def setUp(self):
         self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
 
         # relax template matching
-        self.driver.update_settings({"fixImageFindScreenshotDims": "false",
-                                     "fixImageTemplateSize": "true",
-                                     "autoUpdateImageElementPosition": "true"})
+        self.driver.update_settings({"fixImageFindScreenshotDims": False,
+                                     "fixImageTemplateSize": True,
+                                     "autoUpdateImageElementPosition": True})
 
     def tearDown(self):
         self.driver.quit()
diff --git a/test/unit/webdriver/device/settings_test.py b/test/unit/webdriver/device/settings_test.py
index 337dce29..32d50fb9 100644
--- a/test/unit/webdriver/device/settings_test.py
+++ b/test/unit/webdriver/device/settings_test.py
@@ -26,23 +26,45 @@
 class TestWebDriverSettings(object):
 
     @httpretty.activate
-    def test_get_settings(self):
+    def test_get_settings_bool(self):
         driver = android_w3c_driver()
         httpretty.register_uri(
             httpretty.GET,
             appium_command('/session/1234567890/appium/settings'),
-            body='{"value": {"sample": 123}}'
+            body='{"value": {"sample": true}}'
         )
-        assert driver.get_settings()['sample'] == 123
+        assert driver.get_settings()['sample'] is True
 
     @httpretty.activate
-    def test_update_settings(self):
+    def test_update_settings_bool(self):
         driver = android_w3c_driver()
         httpretty.register_uri(
             httpretty.POST,
             appium_command('/session/1234567890/appium/settings'),
         )
-        assert isinstance(driver.update_settings({"sample": 123}), WebDriver) is True
+        assert isinstance(driver.update_settings({"sample": True}), WebDriver) is True
 
         d = get_httpretty_request_body(httpretty.last_request())
-        assert d['settings']['sample'] == 123
+        assert d['settings']['sample'] is True
+
+    @httpretty.activate
+    def test_get_settings_string(self):
+        driver = android_w3c_driver()
+        httpretty.register_uri(
+            httpretty.GET,
+            appium_command('/session/1234567890/appium/settings'),
+            body='{"value": {"sample": "string"}}'
+        )
+        assert driver.get_settings()['sample'] == 'string'
+
+    @httpretty.activate
+    def test_update_settings_string(self):
+        driver = android_w3c_driver()
+        httpretty.register_uri(
+            httpretty.POST,
+            appium_command('/session/1234567890/appium/settings'),
+        )
+        assert isinstance(driver.update_settings({"sample": 'string'}), WebDriver) is True
+
+        d = get_httpretty_request_body(httpretty.last_request())
+        assert d['settings']['sample'] == 'string'