diff --git a/templates/test/create.tmpl b/templates/test/create.tmpl
index 080a3f4..9b55cea 100644
--- a/templates/test/create.tmpl
+++ b/templates/test/create.tmpl
@@ -5,10 +5,36 @@
 
   <form class="twelve columns" action="/test/create" method="POST">
     <div class="row">
-      <label for="test_name">
-        Test name:
-        <input id="test_name" class="u-full-width" type="text" name="test_name" placeholder="My hardware benchmarking test">
-      </label>
+      <div class="columns three">
+        <label for="test_hardware">
+          Hardware Component:
+          <select id="test_hardware" class="u-full-width" name="test_hardware">
+            {{ range $hw := .Hardware }}
+              <option value="{{ $hw.ID }}">{{ $hw.Name }}</option>
+            {{ end }}
+          </select>
+        </label>
+      </div>
+
+      <div class="columns nine">
+        <label for="test_name">
+          Test name:
+          <input id="test_name" class="u-full-width" type="text" name="test_name" placeholder="My hardware benchmarking test">
+        </label>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="columns twelve">
+        <label for="test_benchmarks">
+          Benchmarks to Test:
+          <select id="test_benchmarks" class="u-full-width" name="test_benchmarks" multiple>
+            {{ range $bm := .Benchmarks }}
+              <option value="{{ $bm.ID }}">{{ $bm.Name }}</option>
+            {{ end }}
+          </select>
+        </label>
+      </div>
     </div>
 
     <div class="row">
diff --git a/web/forms/test.go b/web/forms/test.go
index d961b7d..2d2e1ce 100644
--- a/web/forms/test.go
+++ b/web/forms/test.go
@@ -2,6 +2,7 @@ package forms
 
 type TestForm struct {
   Name        string    `form:"test_name" validate:"required"`
+  Description string    `form:"test_description"`
   Hardware    int       `form:"test_hardware" validate:"required"`
   Benchmarks  []string  `form:"test_benchmarks" validate:"required"`
 }
diff --git a/web/routes/test.go b/web/routes/test.go
index 5c2c776..5ca31f5 100644
--- a/web/routes/test.go
+++ b/web/routes/test.go
@@ -38,6 +38,16 @@ func TestGetView(c flamego.Context, t template.Template, data template.Data) {
 }
 
 func TestGetCreate(t template.Template, data template.Data) {
+  // add hardware components to template
+  var hardware []models.Hardware
+  models.DB.Find(&hardware)
+  data["hardware"] = hardware
+
+  // add benchmarks to template
+  var benchmarks []models.Benchmark
+  models.DB.Find(&benchmarks)
+  data["benchmarks"] = benchmarks
+
   data["title"] = "Create a Test"
   t.HTML(http.StatusOK, "test/create")
 }
@@ -56,6 +66,7 @@ func TestPostCreate(c flamego.Context, form forms.TestForm, errs binding.Errors)
 
   test := models.Test{
     Name: form.Name,
+    Description: form.Description,
     HardwareID: form.Hardware,
   }