diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
index 7c91dda5c3..894f4b130c 100644
--- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -591,7 +591,7 @@
     "name": "setCurrentDirectiveDef"
   },
   {
-    "name": "setCurrentViewQueryIndex"
+    "name": "setCurrentQueryIndex"
   },
   {
     "name": "setFirstTemplatePass"
diff --git a/packages/core/test/render3/query_spec.ts b/packages/core/test/render3/query_spec.ts
index ec16aca8ec..6ec9be6267 100644
--- a/packages/core/test/render3/query_spec.ts
+++ b/packages/core/test/render3/query_spec.ts
@@ -2791,13 +2791,11 @@ describe('query', () => {
           type: ContentQueryDirective,
           selectors: [['', 'content-query', '']],
           factory: () => contentQueryDirective = new ContentQueryDirective(),
-          contentQueries:
-              (dirIndex) => { registerContentQuery(query(TextDirective, true), dirIndex); },
-          contentQueriesRefresh: (dirIndex: number, queryStartIdx: number) => {
+          contentQueries: (dirIndex: number) => { contentQuery(dirIndex, TextDirective, true); },
+          contentQueriesRefresh: (dirIndex: number) => {
             let tmp: any;
             const instance = load<ContentQueryDirective>(dirIndex);
-            queryRefresh(tmp = loadQueryList<TextDirective>(queryStartIdx)) &&
-                (instance.texts = tmp);
+            queryRefresh(tmp = loadContentQuery<TextDirective>()) && (instance.texts = tmp);
           }
         });
       }