diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 345e6aef7..70fae4d33 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1 +1,27 @@
-Test
+<!--
+
+Welcome! If you have a question or are unsure if you should open an issue,
+please use the forum instead!
+
+   https://forum.restic.net
+
+The forum is a better place for questions about restic or general suggestions
+and topics, e.g. usage or documentation questions! This issue tracker is mainly
+for tracking bugs and feature requests directly relating to the development of
+the software itself, rather than the project.
+
+Thanks for understanding, and for contributing to the project!
+-->
+
+
+Output of `restic version`
+--------------------------
+
+<!--
+Please add the version of restic you're currently using here, this helps us
+later to see what has changed in restic when we revisit this issue after some
+time.
+-->
+
+Describe the issue
+------------------
diff --git a/.github/ISSUE_TEMPLATE/Other.md b/.github/ISSUE_TEMPLATE/Other.md
deleted file mode 100644
index 7e952931d..000000000
--- a/.github/ISSUE_TEMPLATE/Other.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Other issue
-about: Open other issue. If you have a question, please use the forum at https://forum.restic.net instead!
----
-
-<!--
-
-Welcome! If you have a question or are unsure if you should open an issue,
-please use the forum instead!
-
-   https://forum.restic.net
-
-The forum is a better place for questions about restic or general suggestions
-and topics, e.g. usage or documentation questions! This issue tracker is mainly
-for tracking bugs and feature requests directly relating to the development of
-the software itself, rather than the project.
-
-Thanks for understanding, and for contributing to the project!
--->
-
-
-Output of `restic version`
---------------------------
-
-<!--
-Please add the version of restic you're currently using here, this helps us
-later to see what has changed in restic when we revisit this issue after some
-time.
--->
-
-Describe the issue
-------------------