diff --git a/packages/runtime-core/__tests__/createComponent.spec.tsx b/packages/runtime-core/__tests__/apiCreateComponent.spec.tsx
similarity index 100%
rename from packages/runtime-core/__tests__/createComponent.spec.tsx
rename to packages/runtime-core/__tests__/apiCreateComponent.spec.tsx
diff --git a/packages/runtime-core/__tests__/apiInject.spec.ts b/packages/runtime-core/__tests__/apiInject.spec.ts
new file mode 100644
index 00000000..b8c7bf62
--- /dev/null
+++ b/packages/runtime-core/__tests__/apiInject.spec.ts
@@ -0,0 +1 @@
+describe('api: provide/inject', () => {})
diff --git a/packages/runtime-core/__tests__/apiLifecycle.spec.ts b/packages/runtime-core/__tests__/apiLifecycle.spec.ts
new file mode 100644
index 00000000..bd1ccf5a
--- /dev/null
+++ b/packages/runtime-core/__tests__/apiLifecycle.spec.ts
@@ -0,0 +1 @@
+describe('api: lifecycle hooks', () => {})
diff --git a/packages/runtime-core/__tests__/apiWatch.spec.ts b/packages/runtime-core/__tests__/apiWatch.spec.ts
new file mode 100644
index 00000000..0c8316d9
--- /dev/null
+++ b/packages/runtime-core/__tests__/apiWatch.spec.ts
@@ -0,0 +1 @@
+describe('api: watch', () => {})
diff --git a/packages/runtime-core/__tests__/attrsFallthrough.spec.ts b/packages/runtime-core/__tests__/vdomAttrsFallthrough.spec.ts
similarity index 98%
rename from packages/runtime-core/__tests__/attrsFallthrough.spec.ts
rename to packages/runtime-core/__tests__/vdomAttrsFallthrough.spec.ts
index 9cc625ac..5e844060 100644
--- a/packages/runtime-core/__tests__/attrsFallthrough.spec.ts
+++ b/packages/runtime-core/__tests__/vdomAttrsFallthrough.spec.ts
@@ -1,5 +1,5 @@
 // using DOM renderer because this case is mostly DOM-specific
-import { h, render, Component, nextTick, cloneVNode } from '@vue/runtime-dom'
+import { createVNode as h, render, nextTick, cloneVNode } from '@vue/runtime-dom'
 
 describe('attribute fallthrough', () => {
   it('everything should be in props when component has no declared props', async () => {
diff --git a/packages/runtime-core/__tests__/vdomChildren.spec.ts b/packages/runtime-core/__tests__/vdomChildren.spec.ts
new file mode 100644
index 00000000..84ec5614
--- /dev/null
+++ b/packages/runtime-core/__tests__/vdomChildren.spec.ts
@@ -0,0 +1,35 @@
+describe('vdom: unkeyed children', () => {
+  test.todo('append')
+
+  test.todo('prepend')
+
+  test.todo('insert in middle')
+
+  test.todo('insert at beginning and end')
+
+  test.todo('insert to empty parent')
+
+  test.todo('shift with offset')
+
+  test.todo('remove from beginning')
+
+  test.todo('remove from end')
+
+  test.todo('remove from middle')
+
+  test.todo('moving single child forward')
+
+  test.todo('moving single child backwards')
+
+  test.todo('moving single child to end')
+
+  test.todo('swap first and last')
+
+  test.todo('move to left & replace')
+
+  test.todo('generic reorder')
+
+  test.todo('should not de-opt when both head and tail change')
+})
+
+describe('vdom: keyed children', () => {})
diff --git a/packages/runtime-core/__tests__/vdomComponent.spec.ts b/packages/runtime-core/__tests__/vdomComponent.spec.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/runtime-core/__tests__/vdomElement.spec.ts b/packages/runtime-core/__tests__/vdomElement.spec.ts
new file mode 100644
index 00000000..6dc22fe2
--- /dev/null
+++ b/packages/runtime-core/__tests__/vdomElement.spec.ts
@@ -0,0 +1,7 @@
+describe('vdom: element', () => {
+  test.todo('with props')
+
+  test.todo('with direct text children')
+
+  test.todo('with text node children')
+})
diff --git a/packages/runtime-core/__tests__/fragment.spec.ts b/packages/runtime-core/__tests__/vdomFragment.spec.ts
similarity index 97%
rename from packages/runtime-core/__tests__/fragment.spec.ts
rename to packages/runtime-core/__tests__/vdomFragment.spec.ts
index 52157472..72f948f4 100644
--- a/packages/runtime-core/__tests__/fragment.spec.ts
+++ b/packages/runtime-core/__tests__/vdomFragment.spec.ts
@@ -1,23 +1,19 @@
 import {
-  h,
-  Component,
+  createVNode as h,
   render,
   nodeOps,
   NodeTypes,
   TestElement,
   Fragment,
-  observable,
+  reactive,
   serialize,
-  ChildrenFlags,
   nextTick,
   resetOps,
   dumpOps,
-  NodeOpTypes,
-  createFragment,
-  createTextVNode
+  NodeOpTypes
 } from '@vue/runtime-test'
 
-describe('Fragments', () => {
+describe('vdom: fragment', () => {
   it('should allow returning multiple component root nodes', async () => {
     class App extends Component {
       render() {
diff --git a/packages/runtime-core/__tests__/vdomOptimizedMode.spec.ts b/packages/runtime-core/__tests__/vdomOptimizedMode.spec.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/runtime-core/__tests__/vnode.spec.ts b/packages/runtime-core/__tests__/vnode.spec.ts
new file mode 100644
index 00000000..e4d3927b
--- /dev/null
+++ b/packages/runtime-core/__tests__/vnode.spec.ts
@@ -0,0 +1,21 @@
+describe('vnode', () => {
+  test.todo('create with just tag')
+
+  test.todo('create with tag and props')
+
+  test.todo('create with tag, props and children')
+
+  test.todo('create with 0 as props')
+
+  test.todo('class normalization')
+
+  test.todo('style normalization')
+
+  test.todo('children normalization')
+
+  test.todo('normalizeVNode')
+
+  test.todo('node type inference')
+
+  test.todo('cloneVNode')
+})