diff --git a/frappe/tests/test_boilerplate.py b/frappe/tests/test_boilerplate.py
new file mode 100644
index 0000000000..4ae78c94de
--- /dev/null
+++ b/frappe/tests/test_boilerplate.py
@@ -0,0 +1,88 @@
+import ast
+import glob
+import os
+import shutil
+import unittest
+from unittest.mock import patch
+
+import frappe
+from frappe.utils.boilerplate import make_boilerplate
+
+
+class TestBoilerPlate(unittest.TestCase):
+	@classmethod
+	def tearDownClass(cls):
+
+		bench_path = frappe.utils.get_bench_path()
+		test_app_dir = os.path.join(bench_path, "apps", "test_app")
+		if os.path.exists(test_app_dir):
+			shutil.rmtree(test_app_dir)
+
+	def test_create_app(self):
+		title = "Test App"
+		description = "Test app for unit testing"
+		publisher = "Test Publisher"
+		email = "example@example.org"
+		icon = ""  # empty -> default
+		color = ""
+		app_license = "MIT"
+
+		user_input = [
+			title,
+			description,
+			publisher,
+			email,
+			icon,
+			color,
+			app_license,
+		]
+
+		bench_path = frappe.utils.get_bench_path()
+		apps_dir = os.path.join(bench_path, "apps")
+		app_name = "test_app"
+
+		with patch("builtins.input", side_effect=user_input):
+			make_boilerplate(apps_dir, app_name)
+
+		root_paths = [
+			app_name,
+			"requirements.txt",
+			"README.md",
+			"setup.py",
+			"license.txt",
+			".git",
+		]
+		paths_inside_app = [
+			"__init__.py",
+			"hooks.py",
+			"patches.txt",
+			"templates",
+			"www",
+			"config",
+			"modules.txt",
+			"public",
+			app_name,
+		]
+
+		new_app_dir = os.path.join(bench_path, apps_dir, app_name)
+
+		all_paths = list()
+
+		for path in root_paths:
+			all_paths.append(os.path.join(new_app_dir, path))
+
+		for path in paths_inside_app:
+			all_paths.append(os.path.join(new_app_dir, app_name, path))
+
+		for path in all_paths:
+			self.assertTrue(os.path.exists(path), msg=f"{path} should exist in new app")
+
+		# check if python files are parsable
+		python_files = glob.glob(new_app_dir + "**/*.py", recursive=True)
+
+		for python_file in python_files:
+			with open(python_file) as p:
+				try:
+					ast.parse(p.read())
+				except Exception as e:
+					self.fail(f"Can't parse python file in new app: {python_file}\n" + str(e))
diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index f6a2ac488c..20e98ac67f 100755
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -3,8 +3,6 @@
 
 from __future__ import unicode_literals, print_function
 
-from six.moves import input
-
 import frappe, os, re, git
 from frappe.utils import touch_file, cstr