diff --git a/clang/utils/analyzer/SATestBuild.py b/clang/utils/analyzer/SATestBuild.py
index 5fbfd41ef4d9..bf9153543c31 100755
--- a/clang/utils/analyzer/SATestBuild.py
+++ b/clang/utils/analyzer/SATestBuild.py
@@ -351,11 +351,10 @@ def checkBuild(SBOutputDir):
     Failures = glob.glob(SBOutputDir + "/*/failures/*.stderr.txt")
     TotalFailed = len(Failures);
     if TotalFailed == 0:
-    #TODO: Re-enable after diagnostics are fixed.
-        #CleanUpEmptyPlists(SBOutputDir)
-        #Plists = glob.glob(SBOutputDir + "/*/*.plist")
-        #print "Number of bug reports (non empty plist files) produced: %d" %\
-        #   len(Plists)
+        CleanUpEmptyPlists(SBOutputDir)
+        Plists = glob.glob(SBOutputDir + "/*/*.plist")
+        print "Number of bug reports (non empty plist files) produced: %d" %\
+           len(Plists)
         return;
     
     # Create summary file to display when the build fails.
@@ -493,9 +492,8 @@ def testProject(ID, IsScanBuild, IsReferenceBuild=False, Dir=None):
 
     checkBuild(SBOutputDir)
     
-    # TODO: Re-enable after the diagnostic regressions are fixed. 
-    #if IsReferenceBuild == False:
-    #    runCmpResults(Dir)
+    if IsReferenceBuild == False:
+        runCmpResults(Dir)
         
     print "Completed tests for project %s (time: %.2f)." % \
           (ID, (time.time()-TBegin))