diff --git a/cfg.mk b/cfg.mk
index 4302338cc83327d59a4c90c0bebcaa0ac36c1836..bf5eae3093207e6d39fde56ee78d53a124395edc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -64,6 +64,7 @@ useless_free_options =		\
   --name=VIR_FREE		\
   --name=xmlFree		\
   --name=xmlXPathFreeContext	\
+  --name=virDomainDefFree	\
   --name=xmlXPathFreeObject
 
 # Avoid uses of write(2).  Either switch to streams (fwrite), or use
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 22e167922687856b753c62cc4f7624f15e0e87c2..55198343ed574b5c30687e2cf201b83018d4e0c4 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -759,8 +759,7 @@ virDomainObjPtr virDomainAssignDef(virCapsPtr caps,
             virDomainDefFree(domain->def);
             domain->def = def;
         } else {
-            if (domain->newDef)
-                virDomainDefFree(domain->newDef);
+            virDomainDefFree(domain->newDef);
             domain->newDef = def;
         }
 
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index f54ebaef200708c2618bf532ed4f3c5376342bf2..fb5c3f6bdaa79b29459f90407ea1a3ddcf7aa6b9 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1328,8 +1328,7 @@ cleanup:
         virDomainObjUnlock(dom);
     if (event)
         testDomainEventQueue(privconn, event);
-    if (def)
-        virDomainDefFree(def);
+    virDomainDefFree(def);
     testDriverUnlock(privconn);
     return ret;
 }