diff --git a/test/code-count/code.def b/test/code-count/code.def
deleted file mode 100644
index 8d70e1086..000000000
--- a/test/code-count/code.def
+++ /dev/null
@@ -1,8 +0,0 @@
-XS
-    filter remove_matches ^\s*//
-    filter call_regexp_common C
-    filter remove_inline //.*$
-    filter remove_inline #.*$
-    extension xs
-    3rd_gen_scale 0.77
-    end_of_line_continuation \\$
diff --git a/test/lib/pgBackRestTest/Common/CodeCountTest.pm b/test/lib/pgBackRestTest/Common/CodeCountTest.pm
index bd66eded5..a45b81532 100644
--- a/test/lib/pgBackRestTest/Common/CodeCountTest.pm
+++ b/test/lib/pgBackRestTest/Common/CodeCountTest.pm
@@ -59,14 +59,10 @@ sub codeCountScan
                  $strFile =~ '^test/\.vagrant/' ||
                  $strFile =~ '^test/certificate/' ||
                  $strFile =~ '^test/code-count/' ||
-                 $strFile =~ '^test/coverage/' ||
                  $strFile =~ '^test/data/' ||
-                 $strFile =~ '^test/docker/' ||
                  $strFile =~ '^test/expect/' ||
-                 $strFile =~ '^test/lint/' ||
-                 $strFile =~ '^test/package/' ||
                  $strFile =~ '^test/patch/' ||
-                 $strFile =~ '^test/profile/' ||
+                 $strFile =~ '^test/result/' ||
                  $strFile eq 'test/scratch.txt' ||
                  $strFile eq 'test/src/valgrind.suppress' ||
                  $strFile eq 'test/src/lcov.conf');
@@ -83,7 +79,7 @@ sub codeCountScan
             $strClass = 'doc/core';
         }
         elsif ($strFile =~ '^build/' ||  $strFile eq 'src/Makefile.in' || $strFile eq 'src/configure' ||
-               $strFile eq 'src/configure.ac')
+               $strFile =~ '^src/build/')
         {
             $strClass = 'build';
         }
@@ -131,7 +127,7 @@ sub codeCountScan
             $strType = 'yaml';
             $strForceLang = 'YAML';
         }
-        elsif ($strFile =~ 'Makefile\.in$' || $strFile =~ '^src\/configure')
+        elsif ($strFile =~ 'Makefile\.in$' || $strFile =~ '^src\/configure' || $strFile =~ '^src\/build\/')
         {
             $strType = 'make';
             $strForceLang = 'make';
@@ -164,7 +160,6 @@ sub codeCountScan
         # Load the file counts
         my $strYaml = executeTest(
             "cloc --yaml ${strBasePath}/${strFile}" .
-            " --read-lang-def=${strBasePath}/test/code-count/code.def" .
             " --force-lang='${strForceLang}'", {bSuppressStdErr => true});
 
         # Error if the file was ignored