diff --git a/assets/js/modules/analytics-4/components/widgets/TopCategoriesWidget.test.js b/assets/js/modules/analytics-4/components/widgets/TopCategoriesWidget.test.js
index 656fa6163bd..1cfe6cc935f 100644
--- a/assets/js/modules/analytics-4/components/widgets/TopCategoriesWidget.test.js
+++ b/assets/js/modules/analytics-4/components/widgets/TopCategoriesWidget.test.js
@@ -82,10 +82,9 @@ describe( 'TopCategoriesWidget', () => {
 			dimensions: [ 'customEvent:googlesitekit_post_categories' ],
 			dimensionFilters: {
 				'customEvent:googlesitekit_post_categories': {
-					filterType: 'stringFilter',
-					matchType: 'EXACT',
-					value: '(not set)',
-					notExpression: true,
+					filterType: 'emptyFilter',
+					value: '',
+					notExpression: false,
 				},
 			},
 			metrics: [ { name: 'screenPageViews' } ],
diff --git a/assets/js/modules/analytics-4/components/widgets/__snapshots__/TopCategoriesWidget.test.js.snap b/assets/js/modules/analytics-4/components/widgets/__snapshots__/TopCategoriesWidget.test.js.snap
index 0adb252b62c..c9dfbe8219c 100644
--- a/assets/js/modules/analytics-4/components/widgets/__snapshots__/TopCategoriesWidget.test.js.snap
+++ b/assets/js/modules/analytics-4/components/widgets/__snapshots__/TopCategoriesWidget.test.js.snap
@@ -48,7 +48,7 @@ exports[`TopCategoriesWidget renders correctly with the expected metrics 1`] = `
                 class="googlesitekit-table__body-item"
               >
                 <strong>
-                  80
+                  31
                 </strong>
               </div>
             </div>
@@ -61,14 +61,14 @@ exports[`TopCategoriesWidget renders correctly with the expected metrics 1`] = `
                 <p
                   class="googlesitekit-km-widget-tile__table-plain-text"
                 >
-                  Wealth
+                  Entertainment, Sports, Media
                 </p>
               </div>
               <div
                 class="googlesitekit-table__body-item"
               >
                 <strong>
-                  63
+                  17
                 </strong>
               </div>
             </div>
@@ -81,14 +81,14 @@ exports[`TopCategoriesWidget renders correctly with the expected metrics 1`] = `
                 <p
                   class="googlesitekit-km-widget-tile__table-plain-text"
                 >
-                  Entertainment, Sports, Media
+                  Wealth
                 </p>
               </div>
               <div
                 class="googlesitekit-table__body-item"
               >
                 <strong>
-                  3
+                  12
                 </strong>
               </div>
             </div>
diff --git a/assets/js/modules/analytics-4/datastore/custom-dimensions-gathering-data.test.js b/assets/js/modules/analytics-4/datastore/custom-dimensions-gathering-data.test.js
index 3f326a25726..00b3b585df5 100644
--- a/assets/js/modules/analytics-4/datastore/custom-dimensions-gathering-data.test.js
+++ b/assets/js/modules/analytics-4/datastore/custom-dimensions-gathering-data.test.js
@@ -151,7 +151,7 @@ describe( 'modules/analytics-4 custom-dimensions-gathering-data', () => {
 				{
 					dimensionValues: [
 						{
-							value: '(not set)',
+							value: '789',
 						},
 					],
 					metricValues: [
@@ -207,40 +207,6 @@ describe( 'modules/analytics-4 custom-dimensions-gathering-data', () => {
 			},
 		};
 
-		const dataAvailabilityReportWithNoSetValues = {
-			dimensionHeaders: [
-				{
-					name: `customEvent:${ customDimension }`,
-				},
-			],
-			metricHeaders: [
-				{
-					name: 'eventCount',
-					type: 'TYPE_INTEGER',
-				},
-			],
-			rows: [
-				{
-					dimensionValues: [
-						{
-							value: '(not set)',
-						},
-					],
-					metricValues: [
-						{
-							value: '123',
-						},
-					],
-				},
-			],
-			rowCount: 1,
-			metadata: {
-				currencyCode: 'USD',
-				timeZone: 'Europe/London',
-			},
-			kind: 'analyticsData#runReport',
-		};
-
 		let previousSiteKitModulesData;
 
 		beforeEach( () => {
@@ -325,8 +291,15 @@ describe( 'modules/analytics-4 custom-dimensions-gathering-data', () => {
 					startDate: createDate,
 					endDate: referenceDate,
 					dimensions: [ `customEvent:${ customDimension }` ],
+					dimensionFilters: {
+						[ `customEvent:${ customDimension }` ]: {
+							filterType: 'emptyFilter',
+							value: '',
+							notExpression: false,
+						},
+					},
 					metrics: [ { name: 'eventCount' } ],
-					limit: 2,
+					limit: 1,
 				};
 
 				if ( report ) {
@@ -423,14 +396,6 @@ describe( 'modules/analytics-4 custom-dimensions-gathering-data', () => {
 						} );
 					},
 				],
-				[
-					'the report contains no set values',
-					() => {
-						setupCustomDimensionDataAvailability( {
-							report: dataAvailabilityReportWithNoSetValues,
-						} );
-					},
-				],
 			] )(
 				'should set gathering data to be TRUE and not dispatch a fetch request to save it when %s',
 				async ( _, setupTest ) => {