diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 77d578404..b9766226d 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -928,7 +928,7 @@ class CLITestCase(DockerClientTestCase):
         assert foo_container.get('HostConfig.NetworkMode') == \
             'container:{}'.format(bar_container.id)
 
-    @v2_1_only()
+    @v3_only()
     def test_up_with_healthcheck(self):
         def wait_on_health_status(container, status):
             def condition():
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 7a68333ff..31a888ed0 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -921,8 +921,8 @@ class ConfigTest(unittest.TestCase):
                 'image': 'example/web',
                 'volumes': [VolumeSpec.parse('/home/user/project:/code')],
                 'depends_on': {
-                    'db': {'condition': 'container_start'},
-                    'other': {'condition': 'container_start'},
+                    'db': {'condition': 'service_started'},
+                    'other': {'condition': 'service_started'},
                 },
             },
             {
@@ -3059,7 +3059,7 @@ class ExtendsTest(unittest.TestCase):
         """)
         services = load_from_filename(str(tmpdir.join('docker-compose.yml')))
         assert service_sort(services)[2]['depends_on'] == {
-            'other': {'condition': 'container_start'}
+            'other': {'condition': 'service_started'}
         }