diff --git a/.mocharc.json b/.mocharc.json
index 704992edb6..714e3cc6f5 100644
--- a/.mocharc.json
+++ b/.mocharc.json
@@ -2,7 +2,6 @@
   "require": "ts-node/register,source-map-support/register",
   "watch-extensions": "ts",
   "extensions": [".ts", ".js", ".json"],
-  "spec": ["./test/**/*.test.ts"],
   "watch-files": ["src", "test"],
   "recursive": true,
   "reporter": "spec",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb90243612..753d8d3fee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,17 +6,15 @@ All notable changes to this project will be documented in this file. See [standa
 
 ## [5.7.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.6.4...v5.7.0) (2021-11-24)
 
-
 ### Features
 
-* add metadata types StnryAssetEnvSrcCnfg, BldgEnrgyIntensityCnfg, VehicleAssetEmssnSrcCnfg ([#508](https://github.com/forcedotcom/source-deploy-retrieve/issues/508)) ([e3dc3ef](https://github.com/forcedotcom/source-deploy-retrieve/commit/e3dc3ef51d8fba19ec9dfda43ca41ddaf26c9bc0))
+- add metadata types StnryAssetEnvSrcCnfg, BldgEnrgyIntensityCnfg, VehicleAssetEmssnSrcCnfg ([#508](https://github.com/forcedotcom/source-deploy-retrieve/issues/508)) ([e3dc3ef](https://github.com/forcedotcom/source-deploy-retrieve/commit/e3dc3ef51d8fba19ec9dfda43ca41ddaf26c9bc0))
 
 ### [5.6.4](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.6.3...v5.6.4) (2021-11-22)
 
-
 ### Bug Fixes
 
-* run unspecified child types through forceignore to avoid retrieving ([#505](https://github.com/forcedotcom/source-deploy-retrieve/issues/505)) ([4e327b6](https://github.com/forcedotcom/source-deploy-retrieve/commit/4e327b60de27168dc0b3e8a63ba70dbce96df03a))
+- run unspecified child types through forceignore to avoid retrieving ([#505](https://github.com/forcedotcom/source-deploy-retrieve/issues/505)) ([4e327b6](https://github.com/forcedotcom/source-deploy-retrieve/commit/4e327b60de27168dc0b3e8a63ba70dbce96df03a))
 
 ### [5.6.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.6.2...v5.6.3) (2021-11-18)
 
diff --git a/test/registry/registryValidation.test.ts b/test/registry/registryValidation.test.ts
index 177c0dacfd..30c2b74964 100644
--- a/test/registry/registryValidation.test.ts
+++ b/test/registry/registryValidation.test.ts
@@ -7,12 +7,28 @@
 import { expect } from 'chai';
 import { MetadataRegistry } from '../../src';
 import { registry as defaultRegistry } from '../../src/registry/registry';
+import { metadataTypes as UnsupportedTypes } from '../../src/registry/nonSupportedTypes';
 import { MetadataType, TransformerStrategy, DecompositionStrategy } from '../../src/registry/types';
 
 describe('Registry Validation', () => {
   const registry = defaultRegistry as MetadataRegistry;
   const typesWithChildren = Object.values(registry.types).filter((type) => type.children);
 
+  describe('non-supported types', () => {
+    Object.values(registry.types).forEach((type) => {
+      it(`${type.name} should not be in UnsupportedTypes`, () => {
+        expect(UnsupportedTypes).to.not.include(type.name);
+      });
+    });
+    typesWithChildren.forEach((type) => {
+      Object.values(type.children.types).forEach((child) => {
+        it(`${child.name} should not be in UnsupportedTypes`, () => {
+          expect(UnsupportedTypes).to.not.include(child.name);
+        });
+      });
+    });
+  });
+
   describe('child types', () => {
     describe('child types are configured properly', () => {
       typesWithChildren.forEach((type) => {