diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7495ead..11f454f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,4 @@
-How Do I Submit A Good Bug Report?
-----------------------------------
+# How Do I Submit A Good Bug Report?
 
 Please, don't send direct emails to Stéphane Raimbault unless you want
 commercial support.
@@ -7,8 +6,8 @@ commercial support.
 Take care to read the documentation at http://libmodbus.org/.
 
 - *Be sure it's a bug before creating an issue*, in doubt, post a message on
-  https://groups.google.com/forum/#!forum/libmodbus or send an email to
-  libmodbus@googlegroups.com
+  <https://groups.google.com/forum/#!forum/libmodbus> or send an email to
+  <libmodbus@googlegroups.com>
 
 - *Use a clear and descriptive title* for the issue to identify
 
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index ad34147..9d87f4b 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -62,11 +62,11 @@ everything up to and including the following line which starts with ---.
 
   <...>
 
-## Expected behavior
+## Actual behavior if applicable
 
   <...>
 
-## Actual behavior
+## Expected behavior or suggestion
 
   <...>
 
diff --git a/tests/README.md b/tests/README.md
index 39bd813..1460815 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,8 +1,12 @@
-# License
+# Tests
+
+## License
+
 Test programs of this directory are provided under BSD license (see associated
 LICENSE file).
 
-# Compilation
+## Compilation
+
 After installation, you can use pkg-config to compile these tests.
 For example, to compile random-test-server run: