diff --git a/test/unit/config_t.c b/test/unit/config_t.c
index 938777644..142586803 100644
--- a/test/unit/config_t.c
+++ b/test/unit/config_t.c
@@ -27,25 +27,26 @@ int config_fini() {
 	return 0;
 }
 
+static const char *conf =
+	"id = \"yada-yada\"\n"
+	"seqno = 15\n"
+	"status = [\"READ\", \"WRITE\"]\n"
+	"flags = []\n"
+	"extent_size = 8192\n"
+	"physical_volumes {\n"
+	"    pv0 {\n"
+	"        id = \"abcd-efgh\"\n"
+	"    }\n"
+	"    pv1 {\n"
+	"        id = \"bbcd-efgh\"\n"
+	"    }\n"
+	"    pv2 {\n"
+	"        id = \"cbcd-efgh\"\n"
+	"    }\n"
+	"}\n";
+
 static void test_parse()
 {
-	const char *conf =
-		"id = \"yada-yada\"\n"
-		"seqno = 15\n"
-		"status = [\"READ\", \"WRITE\"]\n"
-		"flags = []\n"
-		"extent_size = 8192\n"
-		"physical_volumes {\n"
-		"    pv0 {\n"
-		"        id = \"abcd-efgh\"\n"
-		"    }\n"
-		"    pv1 {\n"
-		"        id = \"bbcd-efgh\"\n"
-		"    }\n"
-		"    pv2 {\n"
-		"        id = \"cbcd-efgh\"\n"
-		"    }\n"
-		"}\n";
 	struct dm_config_tree *tree = dm_config_from_string(conf);
 	struct dm_config_value *value;
 
@@ -69,15 +70,53 @@ static void test_parse()
 	// CU_ASSERT(!dm_config_get_list(tree->root, "extent_size", NULL));
 
 	CU_ASSERT(dm_config_get_list(tree->root, "flags", &value));
-	CU_ASSERT(value->next == NULL);
+	CU_ASSERT(value->next == NULL); /* an empty list */
 	CU_ASSERT(dm_config_get_list(tree->root, "status", &value));
-	CU_ASSERT(value->next != NULL);
+	CU_ASSERT(value->next != NULL); /* a non-empty list */
 
 	dm_config_destroy(tree);
 }
 
+static void test_clone()
+{
+	struct dm_config_tree *tree = dm_config_from_string(conf);
+	struct dm_config_node *n = dm_config_clone_node(tree, tree->root, 1);
+	struct dm_config_value *value;
+
+	/* Check that the nodes are actually distinct. */
+	CU_ASSERT(n != tree->root);
+	CU_ASSERT(n->sib != tree->root->sib);
+	CU_ASSERT(dm_config_find_node(n, "physical_volumes") != NULL);
+	CU_ASSERT(dm_config_find_node(tree->root, "physical_volumes") != NULL);
+	CU_ASSERT(dm_config_find_node(n, "physical_volumes") != dm_config_find_node(tree->root, "physical_volumes"));
+
+	CU_ASSERT(dm_config_has_node(n, "id"));
+	CU_ASSERT(dm_config_has_node(n, "physical_volumes"));
+	CU_ASSERT(dm_config_has_node(n, "physical_volumes/pv0"));
+	CU_ASSERT(dm_config_has_node(n, "physical_volumes/pv0/id"));
+
+	CU_ASSERT(!strcmp(dm_config_find_str(n, "id", "foo"), "yada-yada"));
+	CU_ASSERT(!strcmp(dm_config_find_str(n, "idt", "foo"), "foo"));
+
+	CU_ASSERT(!strcmp(dm_config_find_str(n, "physical_volumes/pv0/bb", "foo"), "foo"));
+	CU_ASSERT(!strcmp(dm_config_find_str(n, "physical_volumes/pv0/id", "foo"), "abcd-efgh"));
+
+	CU_ASSERT(!dm_config_get_uint32(n, "id", NULL));
+	CU_ASSERT(dm_config_get_uint32(n, "extent_size", NULL));
+
+	/* FIXME: Currently everything parses as a list, even if it's not */
+	// CU_ASSERT(!dm_config_get_list(tree->root, "id", NULL));
+	// CU_ASSERT(!dm_config_get_list(tree->root, "extent_size", NULL));
+
+	CU_ASSERT(dm_config_get_list(n, "flags", &value));
+	CU_ASSERT(value->next == NULL); /* an empty list */
+	CU_ASSERT(dm_config_get_list(n, "status", &value));
+	CU_ASSERT(value->next != NULL); /* a non-empty list */
+}
+
 CU_TestInfo config_list[] = {
 	{ (char*)"parse", test_parse },
+	{ (char*)"clone", test_clone },
 	CU_TEST_INFO_NULL
 };