diff --git a/dev-infra/commit-message/config.ts b/dev-infra/commit-message/config.ts
index 4675498cb5..e0f24a5bf7 100644
--- a/dev-infra/commit-message/config.ts
+++ b/dev-infra/commit-message/config.ts
@@ -92,7 +92,7 @@ export const COMMIT_TYPES: {[key: string]: CommitType} = {
   refactor: {
     name: 'refactor',
     description: 'Refactor without any change in functionality or API (includes style changes)',
-    scope: ScopeRequirement.Required,
+    scope: ScopeRequirement.Optional,
     releaseNotesLevel: ReleaseNotesLevel.Hidden,
   },
   release: {
@@ -104,7 +104,7 @@ export const COMMIT_TYPES: {[key: string]: CommitType} = {
   test: {
     name: 'test',
     description: 'Improvements or corrections made to the project\'s test suite',
-    scope: ScopeRequirement.Required,
+    scope: ScopeRequirement.Optional,
     releaseNotesLevel: ReleaseNotesLevel.Hidden,
   },
 };
diff --git a/dev-infra/ng-dev.js b/dev-infra/ng-dev.js
index e3516dee5d..2949c3f0a2 100755
--- a/dev-infra/ng-dev.js
+++ b/dev-infra/ng-dev.js
@@ -1716,7 +1716,7 @@ const COMMIT_TYPES = {
     refactor: {
         name: 'refactor',
         description: 'Refactor without any change in functionality or API (includes style changes)',
-        scope: ScopeRequirement.Required,
+        scope: ScopeRequirement.Optional,
         releaseNotesLevel: ReleaseNotesLevel.Hidden,
     },
     release: {
@@ -1728,7 +1728,7 @@ const COMMIT_TYPES = {
     test: {
         name: 'test',
         description: 'Improvements or corrections made to the project\'s test suite',
-        scope: ScopeRequirement.Required,
+        scope: ScopeRequirement.Optional,
         releaseNotesLevel: ReleaseNotesLevel.Hidden,
     },
 };