diff --git a/zaza/openstack/charm_tests/trilio/tests.py b/zaza/openstack/charm_tests/trilio/tests.py
index 0bf0cd8..5072b29 100644
--- a/zaza/openstack/charm_tests/trilio/tests.py
+++ b/zaza/openstack/charm_tests/trilio/tests.py
@@ -463,10 +463,18 @@ class TrilioDMAPITest(TrilioBaseTest):
     services = ["dmapi-api"]
 
 
-class TrilioDataMoverTest(TrilioBaseTest):
+class TrilioDataMoverBaseTest(TrilioBaseTest):
     """Tests for Trilio Data Mover charm."""
 
     conf_file = "/etc/tvault-contego/tvault-contego.conf"
     application_name = "trilio-data-mover"
 
     services = ["tvault-contego"]
+
+
+class TrilioDataMoverNFSTest(TrilioDataMoverBaseTest, TrilioGhostNFSShareTest):
+    """Tests for Trilio Data Mover charm backed by NFS."""
+
+
+class TrilioDataMoverS3Test(TrilioDataMoverBaseTest):
+    """Tests for Trilio Data Mover charm backed by S3."""