diff --git a/compose/config/config_schema_v2.0.json b/compose/config/config_schema_v2.0.json
index da0105aea..d20a0d89a 100644
--- a/compose/config/config_schema_v2.0.json
+++ b/compose/config/config_schema_v2.0.json
@@ -80,14 +80,14 @@
         "depends_on": {"$ref": "#/definitions/list_of_strings"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_opt": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "uniqueItems": true
+        },
         "dns_search": {"$ref": "#/definitions/string_or_list"},
-		"dns_opt": {
-			"type": "array",
-			"items": {
-				"type": "string"
-			},
-			"uniqueItems": true
-		},
         "domainname": {"type": "string"},
         "entrypoint": {
           "oneOf": [
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index d1ffff89a..3b01ddf69 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -100,6 +100,13 @@
           ]
         },
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "dns_opt": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "uniqueItems": true
+        },
         "dns": {"$ref": "#/definitions/string_or_list"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "domainname": {"type": "string"},
diff --git a/compose/service.py b/compose/service.py
index 0b6200dd5..353c96af4 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -757,6 +757,7 @@ class Service(object):
             devices=options.get('devices'),
             dns=options.get('dns'),
             dns_opt=options.get('dns_opt'),
+            dns_search=options.get('dns_search'),
             restart_policy=options.get('restart'),
             cap_add=options.get('cap_add'),
             cap_drop=options.get('cap_drop'),
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index f3dc346d1..910f2c69c 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -887,16 +887,16 @@ class ServiceTest(DockerClientTestCase):
         container = create_and_start_container(service)
 
         host_container_groupadd = container.get('HostConfig.GroupAdd')
-        self.assertTrue("root" in host_container_groupadd)
-        self.assertTrue("1" in host_container_groupadd)
+        assert "root" in host_container_groupadd
+        assert "1" in host_container_groupadd
 
     def test_dns_opt_value(self):
         service = self.create_service('web', dns_opt=["use-vc", "no-tld-query"])
         container = create_and_start_container(service)
 
-        dns_opt = container.get('HostConfig.DNSOptions')
-        self.assertTrue("use-vc" in dns_opt)
-        self.assertTrue("no-tld-query" in dns_opt)
+        dns_opt = container.get('HostConfig.DnsOptions')
+        assert 'use-vc' in dns_opt
+        assert 'no-tld-query' in dns_opt
 
     def test_restart_on_failure_value(self):
         service = self.create_service('web', restart={