diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index d8321edbf..73c287654 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -206,6 +206,12 @@ Stylesheets/Caption: Stylesheets
 Stylesheets/Expand/Caption: Expand All
 Stylesheets/Hint: This is the rendered CSS of the current stylesheet tiddlers tagged with <<tag "$:/tags/Stylesheet">>
 Stylesheets/Restore/Caption: Restore
+TestCases/Caption: Test Cases
+TestCases/Hint: Test cases are self contained examples for testing and learning
+TestCases/All/Caption: All Test Cases
+TestCases/All/Hint: All Test Cases
+TestCases/Failed/Caption: Failed Test Cases
+TestCases/Failed/Hint: Just Failed Test Cases
 Theme/Caption: Theme
 Theme/Prompt: Current theme:
 TiddlerFields/Caption: Tiddler Fields
diff --git a/core/ui/ControlPanel/TestCases.tid b/core/ui/ControlPanel/TestCases.tid
new file mode 100644
index 000000000..401e14113
--- /dev/null
+++ b/core/ui/ControlPanel/TestCases.tid
@@ -0,0 +1,10 @@
+title: $:/core/ui/ControlPanel/TestCases
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/TestCases/Caption}}
+
+\whitespace trim
+{{$:/language/ControlPanel/TestCases/Hint}}
+
+<div class="tc-control-panel">
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/TestCases]!has[draft.of]]" default="$:/core/ui/ControlPanel/TestCases/All"/>
+</div>
diff --git a/core/ui/ControlPanel/TestCasesAll.tid b/core/ui/ControlPanel/TestCasesAll.tid
new file mode 100644
index 000000000..f88166943
--- /dev/null
+++ b/core/ui/ControlPanel/TestCasesAll.tid
@@ -0,0 +1,24 @@
+title: $:/core/ui/ControlPanel/TestCases/All
+tags: $:/tags/ControlPanel/TestCases
+caption: {{$:/language/ControlPanel/TestCases/All/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/
+<<lingo TestCases/All/Hint>>
+
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]]">
+
+<h2>
+
+<$link>
+
+<$text text=<<currentTiddler>>/>
+
+</$link>
+
+</h2>
+
+<$transclude
+	$tiddler="$:/core/ui/TestCaseTemplate"
+/>
+
+</$list>
diff --git a/core/ui/ControlPanel/TestCasesFailed.tid b/core/ui/ControlPanel/TestCasesFailed.tid
new file mode 100644
index 000000000..6ec03c5a3
--- /dev/null
+++ b/core/ui/ControlPanel/TestCasesFailed.tid
@@ -0,0 +1,15 @@
+title: $:/core/ui/ControlPanel/TestCases/Failed
+tags: $:/tags/ControlPanel/TestCases
+caption: {{$:/language/ControlPanel/TestCases/Failed/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/
+<<lingo TestCases/Failed/Hint>>
+
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]]">
+
+<$transclude
+	$tiddler="$:/core/ui/TestCaseTemplate"
+	hideIfPass="yes"
+/>
+
+</$list>
diff --git a/core/ui/TestCaseTemplate.tid b/core/ui/TestCaseTemplate.tid
new file mode 100644
index 000000000..4953f9859
--- /dev/null
+++ b/core/ui/TestCaseTemplate.tid
@@ -0,0 +1,12 @@
+title: $:/core/ui/TestCaseTemplate
+
+\parameters (hideIfPass:"no")
+<$testcase
+	testOutput="Output"
+	testExpectedResult="ExpectedResult"
+	testActions="Actions"
+	testHideIfPass=<<hideIfPass>>
+>
+<$data $compound-tiddler=<<currentTiddler>>/>
+<$data title="Description" text={{!!description}}/>
+</$testcase>