Index: main/data.c
===================================================================
--- main/data.c	(revision 398365)
+++ main/data.c	(working copy)
@@ -3290,6 +3290,7 @@
 	ao2_t_ref(root_data.container, -1, "Unref root_data.container in data_shutdown");
 	root_data.container = NULL;
 	ast_rwlock_destroy(&root_data.lock);
+	AST_TEST_UNREGISTER(test_data_get);
 }
 
 int ast_data_init(void)
@@ -3307,9 +3308,7 @@
 
 	res |= ast_manager_register_xml("DataGet", 0, manager_data_get);
 
-#ifdef TEST_FRAMEWORK
 	AST_TEST_REGISTER(test_data_get);
-#endif
 
 	ast_register_atexit(data_shutdown);