diff --git a/packages/runtime-core/__tests__/component.spec.ts b/packages/runtime-core/__tests__/component.spec.ts
new file mode 100644
index 00000000..b9483931
--- /dev/null
+++ b/packages/runtime-core/__tests__/component.spec.ts
@@ -0,0 +1,11 @@
+describe('renderer: component', () => {
+  test.todo('should work')
+
+  test.todo('shouldUpdateComponent')
+
+  test.todo('componentProxy')
+
+  test.todo('componentProps')
+
+  test.todo('componentSlots')
+})
diff --git a/packages/runtime-core/__tests__/h.spec.ts b/packages/runtime-core/__tests__/h.spec.ts
index 617f707b..b71958d8 100644
--- a/packages/runtime-core/__tests__/h.spec.ts
+++ b/packages/runtime-core/__tests__/h.spec.ts
@@ -3,7 +3,7 @@ import { createVNode } from '../src/vnode'
 
 // Since h is a thin layer on top of createVNode, we are only testing its
 // own logic here. Details of vnode creation is tested in vnode.spec.ts.
-describe('vdom: h', () => {
+describe('renderer: h', () => {
   test('type only', () => {
     expect(h('div')).toMatchObject(createVNode('div'))
   })
diff --git a/packages/runtime-core/__tests__/vdomAttrsFallthrough.spec.ts b/packages/runtime-core/__tests__/rendererAttrsFallthrough.spec.ts
similarity index 100%
rename from packages/runtime-core/__tests__/vdomAttrsFallthrough.spec.ts
rename to packages/runtime-core/__tests__/rendererAttrsFallthrough.spec.ts
diff --git a/packages/runtime-core/__tests__/vdomChildren.spec.ts b/packages/runtime-core/__tests__/rendererChildren.spec.ts
similarity index 88%
rename from packages/runtime-core/__tests__/vdomChildren.spec.ts
rename to packages/runtime-core/__tests__/rendererChildren.spec.ts
index e16e62f9..bed025e9 100644
--- a/packages/runtime-core/__tests__/vdomChildren.spec.ts
+++ b/packages/runtime-core/__tests__/rendererChildren.spec.ts
@@ -1,6 +1,6 @@
 // reference: https://github.com/vuejs/vue/blob/dev/test/unit/modules/vdom/patch/children.spec.js
 
-describe('vdom: unkeyed children', () => {
+describe('renderer: unkeyed children', () => {
   test.todo('append')
 
   test.todo('prepend')
@@ -34,4 +34,4 @@ describe('vdom: unkeyed children', () => {
   test.todo('should not de-opt when both head and tail change')
 })
 
-describe('vdom: keyed children', () => {})
+describe('renderer: keyed children', () => {})
diff --git a/packages/runtime-core/__tests__/vdomElement.spec.ts b/packages/runtime-core/__tests__/rendererElement.spec.ts
similarity index 80%
rename from packages/runtime-core/__tests__/vdomElement.spec.ts
rename to packages/runtime-core/__tests__/rendererElement.spec.ts
index 88e294db..ffab39f5 100644
--- a/packages/runtime-core/__tests__/vdomElement.spec.ts
+++ b/packages/runtime-core/__tests__/rendererElement.spec.ts
@@ -1,4 +1,4 @@
-describe('vdom: element', () => {
+describe('renderer: element', () => {
   test.todo('with props')
 
   test.todo('with direct text children')
diff --git a/packages/runtime-core/__tests__/vdomFragment.spec.ts b/packages/runtime-core/__tests__/rendererFragment.spec.ts
similarity index 99%
rename from packages/runtime-core/__tests__/vdomFragment.spec.ts
rename to packages/runtime-core/__tests__/rendererFragment.spec.ts
index e0833bb8..0be57da3 100644
--- a/packages/runtime-core/__tests__/vdomFragment.spec.ts
+++ b/packages/runtime-core/__tests__/rendererFragment.spec.ts
@@ -13,7 +13,7 @@ import {
   serializeInner
 } from '@vue/runtime-test'
 
-describe('vdom: fragment', () => {
+describe('renderer: fragment', () => {
   it('should allow returning multiple component root nodes', () => {
     const App = {
       render() {
diff --git a/packages/runtime-core/__tests__/rendererOptimizedMode.spec.ts b/packages/runtime-core/__tests__/rendererOptimizedMode.spec.ts
new file mode 100644
index 00000000..b9dd2c91
--- /dev/null
+++ b/packages/runtime-core/__tests__/rendererOptimizedMode.spec.ts
@@ -0,0 +1,3 @@
+describe('renderer: optimized mode', () => {
+  test.todo('should work')
+})
diff --git a/packages/runtime-core/__tests__/rendererPortal.spec.ts b/packages/runtime-core/__tests__/rendererPortal.spec.ts
new file mode 100644
index 00000000..0f8a6911
--- /dev/null
+++ b/packages/runtime-core/__tests__/rendererPortal.spec.ts
@@ -0,0 +1,3 @@
+describe('renderer: portal', () => {
+  test.todo('should work')
+})
diff --git a/packages/runtime-core/__tests__/vdomComponent.spec.ts b/packages/runtime-core/__tests__/vdomComponent.spec.ts
deleted file mode 100644
index a9abae43..00000000
--- a/packages/runtime-core/__tests__/vdomComponent.spec.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-describe('vdom: component', () => {
-  test.todo('should work')
-})
diff --git a/packages/runtime-core/__tests__/vdomOptimizedMode.spec.ts b/packages/runtime-core/__tests__/vdomOptimizedMode.spec.ts
deleted file mode 100644
index 6542f178..00000000
--- a/packages/runtime-core/__tests__/vdomOptimizedMode.spec.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-describe('vdom: optimized mode', () => {
-  test.todo('should work')
-})