diff --git a/kuksa-client/tests/test_grpc.py b/kuksa-client/tests/test_grpc.py
index 036c13f..806f787 100644
--- a/kuksa-client/tests/test_grpc.py
+++ b/kuksa-client/tests/test_grpc.py
@@ -1270,7 +1270,7 @@ async def test_set_some_updates_v2(
         ) as client:
             await client.set(
                 updates=_updates,
-                v1=False,
+                try_v2=True,
             )
             assert val_servicer_v1.Get.call_count == 1
             assert (
@@ -1338,7 +1338,7 @@ async def test_set_no_updates_provided(
             "127.0.0.1", unused_tcp_port, ensure_startup_connection=False
         ) as client:
             with pytest.raises(kuksa_client.grpc.VSSClientError) as exc_info:
-                await client.set(updates=[], v1=False)
+                await client.set(updates=[], try_v2=True)
 
             assert (
                 exc_info.value.args
@@ -1426,7 +1426,7 @@ async def test_set_nonexistent_entries_v2(
                             (Field.VALUE,),
                         ),
                     ),
-                    v1=False,
+                    try_v2=True,
                 )
 
             assert val_servicer_v1.Get.call_count == 1
@@ -1443,7 +1443,7 @@ async def test_set_nonexistent_entries_v2(
                             (Field.VALUE,),
                         ),
                     ),
-                    v1=False,
+                    try_v2=True,
                 )
 
             assert (
@@ -1736,7 +1736,7 @@ async def test_subscribe_some_entries_v2(
                         ),
                     )
                 ),
-                v1=False,
+                try_v2=True,
             ):
                 actual_responses.append(updates)
 
@@ -1820,7 +1820,7 @@ async def test_subscribe_no_entries_requested(
             "127.0.0.1", unused_tcp_port, ensure_startup_connection=False
         ) as client:
             with pytest.raises(VSSClientError):
-                async for _ in client.subscribe(entries=(), v1=False):
+                async for _ in client.subscribe(entries=(), try_v2=True):
                     pass
 
     @pytest.mark.usefixtures("val_server")
@@ -1855,7 +1855,7 @@ async def test_subscribe_nonexistent_entries(
                             ),
                         )
                     ),
-                    v1=False,
+                    try_v2=True,
                 ):
                     pass
 
@@ -2048,7 +2048,7 @@ async def test_add_subscriber_v2(self, mocker, unused_tcp_port, val_servicer_v2)
                 entries=(
                     EntryRequest("Vehicle.Speed", View.CURRENT_VALUE, (Field.VALUE,)),
                 ),
-                v1=False,
+                try_v2=True,
             )
             sub_uid = await subscriber_manager.add_subscriber(
                 subscribe_response_stream, callback=callback
@@ -2107,7 +2107,7 @@ async def test_remove_subscriber_v2(self, mocker, unused_tcp_port, val_servicer_
                 entries=(
                     EntryRequest("Vehicle.Speed", View.CURRENT_VALUE, (Field.VALUE,)),
                 ),
-                v1=False,
+                try_v2=True,
             )
             sub_uid = await subscriber_manager.add_subscriber(
                 subscribe_response_stream, callback=mocker.Mock()