diff --git a/test/test_device.py b/test/sub_current/test_device.py
similarity index 100%
rename from test/test_device.py
rename to test/sub_current/test_device.py
diff --git a/test/test_events.py b/test/sub_current/test_events.py
similarity index 100%
rename from test/test_events.py
rename to test/sub_current/test_events.py
diff --git a/test/test_exceptions.py b/test/sub_current/test_exceptions.py
similarity index 100%
rename from test/test_exceptions.py
rename to test/sub_current/test_exceptions.py
diff --git a/test/test_factory.py b/test/sub_current/test_factory.py
similarity index 100%
rename from test/test_factory.py
rename to test/sub_current/test_factory.py
diff --git a/test/test_file_message.py b/test/sub_current/test_file_message.py
similarity index 100%
rename from test/test_file_message.py
rename to test/sub_current/test_file_message.py
diff --git a/test/test_logging.py b/test/sub_current/test_logging.py
similarity index 100%
rename from test/test_logging.py
rename to test/sub_current/test_logging.py
diff --git a/test/test_network.py b/test/sub_current/test_network.py
similarity index 100%
rename from test/test_network.py
rename to test/sub_current/test_network.py
diff --git a/test/test_payload.py b/test/sub_current/test_payload.py
similarity index 100%
rename from test/test_payload.py
rename to test/sub_current/test_payload.py
diff --git a/test/test_pdu.py b/test/sub_current/test_pdu.py
similarity index 100%
rename from test/test_pdu.py
rename to test/sub_current/test_pdu.py
diff --git a/test/test_remote_datastore.py b/test/sub_current/test_remote_datastore.py
similarity index 100%
rename from test/test_remote_datastore.py
rename to test/sub_current/test_remote_datastore.py
diff --git a/test/test_sparse_datastore.py b/test/sub_current/test_sparse_datastore.py
similarity index 100%
rename from test/test_sparse_datastore.py
rename to test/sub_current/test_sparse_datastore.py
diff --git a/test/test_transaction.py b/test/sub_current/test_transaction.py
similarity index 100%
rename from test/test_transaction.py
rename to test/sub_current/test_transaction.py
diff --git a/test/test_utilities.py b/test/sub_current/test_utilities.py
similarity index 100%
rename from test/test_utilities.py
rename to test/sub_current/test_utilities.py