diff --git a/routes/test.js b/routes/test.js
index 072ed56..48a2e82 100644
--- a/routes/test.js
+++ b/routes/test.js
@@ -3,6 +3,7 @@
 const express = require('express');
 const router = express.Router();
 
+const Account = require('../lib/Account');
 const User = require('../lib/User');
 const Test = require('../lib/Test');
 
@@ -18,6 +19,33 @@ router.get('/tests', async (req, res) => {
 	});
 });
 
+router.get('/test/add', async (req, res) => {
+	const a = await new Account(req.session.userId);
+
+	const promises = [
+		a.getTestTemplates(),
+		a.getClasses()
+	];
+
+	const [ testTemplates, classes ] = await Promise.all(promises);
+
+	res.render('addTest', {
+		title: 'Stratos - Add test',
+		current: 'Tests',
+		name: req.session.fullName,
+		testTemplates: testTemplates,
+		classes: classes
+	});
+});
+
+router.get('/testTemplate/add', (req, res) => {
+	res.render('addTestTemplate', {
+		title: 'Stratos - Add test template',
+		current: 'Tests',
+		name: req.session.fullName
+	});
+});
+
 router.get('/test/:id', async (req, res) => {
 	let t;
 	try {