diff --git a/tests/unit/wallet/test_bcd_data_stream.py b/tests/unit/blockchain/test_bcd_data_stream.py
similarity index 100%
rename from tests/unit/wallet/test_bcd_data_stream.py
rename to tests/unit/blockchain/test_bcd_data_stream.py
diff --git a/tests/unit/wallet/test_claim_proofs.py b/tests/unit/blockchain/test_claim_proofs.py
similarity index 100%
rename from tests/unit/wallet/test_claim_proofs.py
rename to tests/unit/blockchain/test_claim_proofs.py
diff --git a/tests/unit/wallet/test_dewies.py b/tests/unit/blockchain/test_dewies.py
similarity index 100%
rename from tests/unit/wallet/test_dewies.py
rename to tests/unit/blockchain/test_dewies.py
diff --git a/tests/unit/wallet/test_headers.py b/tests/unit/blockchain/test_headers.py
similarity index 100%
rename from tests/unit/wallet/test_headers.py
rename to tests/unit/blockchain/test_headers.py
diff --git a/tests/unit/wallet/test_script.py b/tests/unit/blockchain/test_script.py
similarity index 100%
rename from tests/unit/wallet/test_script.py
rename to tests/unit/blockchain/test_script.py
diff --git a/tests/unit/wallet/test_transaction.py b/tests/unit/blockchain/test_transaction.py
similarity index 100%
rename from tests/unit/wallet/test_transaction.py
rename to tests/unit/blockchain/test_transaction.py
diff --git a/tests/unit/wallet/test_utils.py b/tests/unit/blockchain/test_utils.py
similarity index 100%
rename from tests/unit/wallet/test_utils.py
rename to tests/unit/blockchain/test_utils.py
diff --git a/tests/unit/wallet/test_bip32.py b/tests/unit/crypto/test_bip32.py
similarity index 100%
rename from tests/unit/wallet/test_bip32.py
rename to tests/unit/crypto/test_bip32.py
diff --git a/tests/unit/wallet/test_hash.py b/tests/unit/crypto/test_hash.py
similarity index 100%
rename from tests/unit/wallet/test_hash.py
rename to tests/unit/crypto/test_hash.py
diff --git a/tests/unit/wallet/test_schema_signing.py b/tests/unit/schema/test_schema_signing.py
similarity index 100%
rename from tests/unit/wallet/test_schema_signing.py
rename to tests/unit/schema/test_schema_signing.py
diff --git a/tests/unit/wallet/test_stream_controller.py b/tests/unit/test_event_controller.py
similarity index 100%
rename from tests/unit/wallet/test_stream_controller.py
rename to tests/unit/test_event_controller.py