diff --git a/tests/ragger/client b/tests/ragger/client
index 96cd109..66dee0e 120000
--- a/tests/ragger/client
+++ b/tests/ragger/client
@@ -1 +1 @@
-../../client
\ No newline at end of file
+../../client/src/ledger_app_clients/ethereum
\ No newline at end of file
diff --git a/tests/ragger/test_blind_sign.py b/tests/ragger/test_blind_sign.py
index a86f421..09d8b56 100644
--- a/tests/ragger/test_blind_sign.py
+++ b/tests/ragger/test_blind_sign.py
@@ -2,7 +2,8 @@ import json
 import pytest
 from web3 import Web3
 
-from ledger_app_clients.ethereum.client import EthAppClient, StatusWord
+from client.client import EthAppClient, StatusWord
+
 from ragger.backend import BackendInterface
 from ragger.firmware import Firmware
 from ragger.navigator import Navigator, NavInsID
diff --git a/tests/ragger/test_domain_name.py b/tests/ragger/test_domain_name.py
index 9b6f59d..5c074f5 100644
--- a/tests/ragger/test_domain_name.py
+++ b/tests/ragger/test_domain_name.py
@@ -1,9 +1,10 @@
 import pytest
 from web3 import Web3
 
-import ledger_app_clients.ethereum.response_parser as ResponseParser
-from ledger_app_clients.ethereum.client import EthAppClient, StatusWord
-from ledger_app_clients.ethereum.settings import SettingID, settings_toggle
+import client.response_parser as ResponseParser
+from client.client import EthAppClient, StatusWord
+from client.settings import SettingID, settings_toggle
+
 from ragger.backend import BackendInterface
 from ragger.firmware import Firmware
 from ragger.error import ExceptionRAPDU
diff --git a/tests/ragger/test_eip1559.py b/tests/ragger/test_eip1559.py
index 6379736..14e81b7 100644
--- a/tests/ragger/test_eip1559.py
+++ b/tests/ragger/test_eip1559.py
@@ -1,13 +1,13 @@
-from ledger_app_clients.ethereum.client import EthAppClient
-import ledger_app_clients.ethereum.response_parser as ResponseParser
-from ledger_app_clients.ethereum.utils import recover_transaction
+from web3 import Web3
+
+from client.client import EthAppClient
+import client.response_parser as ResponseParser
+from client.utils import recover_transaction
 
 from ragger.backend import BackendInterface
 from ragger.firmware import Firmware
 from ragger.navigator import Navigator, NavInsID
 
-from web3 import Web3
-
 from constants import ROOT_SNAPSHOT_PATH
 
 
diff --git a/tests/ragger/test_eip191.py b/tests/ragger/test_eip191.py
index 249b6a7..a9de665 100644
--- a/tests/ragger/test_eip191.py
+++ b/tests/ragger/test_eip191.py
@@ -1,8 +1,8 @@
 import pytest
 
-from ledger_app_clients.ethereum.client import EthAppClient, StatusWord
-import ledger_app_clients.ethereum.response_parser as ResponseParser
-from ledger_app_clients.ethereum.utils import recover_message
+from client.client import EthAppClient, StatusWord
+import client.response_parser as ResponseParser
+from client.utils import recover_message
 
 from ragger.error import ExceptionRAPDU
 from ragger.backend import BackendInterface
diff --git a/tests/ragger/test_eip2930.py b/tests/ragger/test_eip2930.py
index 843044a..b9a7844 100644
--- a/tests/ragger/test_eip2930.py
+++ b/tests/ragger/test_eip2930.py
@@ -1,8 +1,8 @@
 from web3 import Web3
 
-from ledger_app_clients.ethereum.client import EthAppClient
-import ledger_app_clients.ethereum.response_parser as ResponseParser
-from ledger_app_clients.ethereum.utils import recover_transaction
+from client.client import EthAppClient
+import client.response_parser as ResponseParser
+from client.utils import recover_transaction
 
 from ragger.backend import BackendInterface
 from ragger.firmware import Firmware
diff --git a/tests/ragger/test_eip712.py b/tests/ragger/test_eip712.py
index 975e10f..1d9a782 100644
--- a/tests/ragger/test_eip712.py
+++ b/tests/ragger/test_eip712.py
@@ -8,11 +8,11 @@ import json
 from typing import Optional
 import pytest
 
-import ledger_app_clients.ethereum.response_parser as ResponseParser
-from ledger_app_clients.ethereum.utils import recover_message
-from ledger_app_clients.ethereum.client import EthAppClient
-from ledger_app_clients.ethereum.eip712 import InputData
-from ledger_app_clients.ethereum.settings import SettingID, settings_toggle
+import client.response_parser as ResponseParser
+from client.utils import recover_message
+from client.client import EthAppClient
+from client.eip712 import InputData
+from client.settings import SettingID, settings_toggle
 
 from ragger.backend import BackendInterface
 from ragger.firmware import Firmware
diff --git a/tests/ragger/test_erc20information.py b/tests/ragger/test_erc20information.py
index e8ac552..130b3ac 100644
--- a/tests/ragger/test_erc20information.py
+++ b/tests/ragger/test_erc20information.py
@@ -1,5 +1,6 @@
 import pytest
-from ledger_app_clients.ethereum.client import EthAppClient, StatusWord
+
+from client.client import EthAppClient, StatusWord
 
 from ragger.error import ExceptionRAPDU
 from ragger.backend import BackendInterface
diff --git a/tests/ragger/test_get_address.py b/tests/ragger/test_get_address.py
index c88c116..c61bffa 100644
--- a/tests/ragger/test_get_address.py
+++ b/tests/ragger/test_get_address.py
@@ -1,8 +1,8 @@
 from typing import Optional, Tuple
 import pytest
 
-from ledger_app_clients.ethereum.client import EthAppClient, StatusWord
-import ledger_app_clients.ethereum.response_parser as ResponseParser
+from client.client import EthAppClient, StatusWord
+import client.response_parser as ResponseParser
 
 from ragger.error import ExceptionRAPDU
 from ragger.firmware import Firmware
diff --git a/tests/ragger/test_nft.py b/tests/ragger/test_nft.py
index 454dd48..ef60205 100644
--- a/tests/ragger/test_nft.py
+++ b/tests/ragger/test_nft.py
@@ -1,12 +1,11 @@
 from typing import Callable, Optional, Any
 import json
 import pytest
-
 from web3 import Web3
 
-from ledger_app_clients.ethereum.client import EthAppClient, StatusWord
-import ledger_app_clients.ethereum.response_parser as ResponseParser
-from ledger_app_clients.ethereum.utils import get_selector_from_data, recover_transaction
+from client.client import EthAppClient, StatusWord
+import client.response_parser as ResponseParser
+from client.utils import get_selector_from_data, recover_transaction
 
 from ragger.error import ExceptionRAPDU
 from ragger.firmware import Firmware
diff --git a/tests/ragger/test_sign.py b/tests/ragger/test_sign.py
index efc6c44..ea85ec7 100644
--- a/tests/ragger/test_sign.py
+++ b/tests/ragger/test_sign.py
@@ -1,8 +1,8 @@
 from web3 import Web3
 
-from ledger_app_clients.ethereum.client import EthAppClient, StatusWord
-import ledger_app_clients.ethereum.response_parser as ResponseParser
-from ledger_app_clients.ethereum.utils import recover_transaction
+from client.client import EthAppClient, StatusWord
+import client.response_parser as ResponseParser
+from client.utils import recover_transaction
 
 from ragger.error import ExceptionRAPDU
 from ragger.backend import BackendInterface