diff --git a/doc/toolbox-create.1.md b/doc/toolbox-create.1.md
index 83efbb7..08c8e75 100644
--- a/doc/toolbox-create.1.md
+++ b/doc/toolbox-create.1.md
@@ -1,4 +1,4 @@
-% toolbox-create(1)
+% toolbox-create 1
 
 ## NAME
 toolbox\-create - Create a new toolbox container
diff --git a/doc/toolbox-enter.1.md b/doc/toolbox-enter.1.md
index fda0072..5e88955 100644
--- a/doc/toolbox-enter.1.md
+++ b/doc/toolbox-enter.1.md
@@ -1,4 +1,4 @@
-% toolbox-enter(1)
+% toolbox-enter 1
 
 ## NAME
 toolbox\-enter - Enter a toolbox container for interactive use
diff --git a/doc/toolbox-help.1.md b/doc/toolbox-help.1.md
index e680095..ec96cac 100644
--- a/doc/toolbox-help.1.md
+++ b/doc/toolbox-help.1.md
@@ -1,4 +1,4 @@
-% toolbox-help(1)
+% toolbox-help 1
 
 ## NAME
 toolbox\-help - Display help information about Toolbox
diff --git a/doc/toolbox-init-container.1.md b/doc/toolbox-init-container.1.md
index 358a8aa..45c9a77 100644
--- a/doc/toolbox-init-container.1.md
+++ b/doc/toolbox-init-container.1.md
@@ -1,4 +1,4 @@
-% toolbox-init-container(1)
+% toolbox-init-container 1
 
 ## NAME
 toolbox\-init\-container - Initialize a running container
diff --git a/doc/toolbox-list.1.md b/doc/toolbox-list.1.md
index a7ee2fe..493f4eb 100644
--- a/doc/toolbox-list.1.md
+++ b/doc/toolbox-list.1.md
@@ -1,4 +1,4 @@
-% toolbox-list(1)
+% toolbox-list 1
 
 ## NAME
 toolbox\-list - List existing toolbox containers and images
diff --git a/doc/toolbox-rm.1.md b/doc/toolbox-rm.1.md
index 0552417..0b50c36 100644
--- a/doc/toolbox-rm.1.md
+++ b/doc/toolbox-rm.1.md
@@ -1,4 +1,4 @@
-% toolbox-rm(1)
+% toolbox-rm 1
 
 ## NAME
 toolbox\-rm - Remove one or more toolbox containers
diff --git a/doc/toolbox-rmi.1.md b/doc/toolbox-rmi.1.md
index e173067..2c981da 100644
--- a/doc/toolbox-rmi.1.md
+++ b/doc/toolbox-rmi.1.md
@@ -1,4 +1,4 @@
-% toolbox-rmi(1)
+% toolbox-rmi 1
 
 ## NAME
 toolbox\-rmi - Remove one or more toolbox images
diff --git a/doc/toolbox-run.1.md b/doc/toolbox-run.1.md
index df549c0..c65a15e 100644
--- a/doc/toolbox-run.1.md
+++ b/doc/toolbox-run.1.md
@@ -1,4 +1,4 @@
-% toolbox-run(1)
+% toolbox-run 1
 
 ## NAME
 toolbox\-run - Run a command in an existing toolbox container
diff --git a/doc/toolbox.1.md b/doc/toolbox.1.md
index c714751..c363509 100644
--- a/doc/toolbox.1.md
+++ b/doc/toolbox.1.md
@@ -1,4 +1,4 @@
-% toolbox(1)
+% toolbox 1
 
 ## NAME
 toolbox - Tool for containerized command line environments on Linux
diff --git a/doc/toolbox.conf.5.md b/doc/toolbox.conf.5.md
index cf9d336..131e1ed 100644
--- a/doc/toolbox.conf.5.md
+++ b/doc/toolbox.conf.5.md
@@ -1,4 +1,4 @@
-% toolbox.conf(5)
+% toolbox.conf 5
 
 ## NAME
 toolbox.conf - Toolbox configuration file
diff --git a/test/system/002-help.bats b/test/system/002-help.bats
index 1888f0c..7e4565e 100644
--- a/test/system/002-help.bats
+++ b/test/system/002-help.bats
@@ -42,7 +42,8 @@ setup() {
   run $TOOLBOX help
 
   assert_success
-  assert_line --index 0 --partial "toolbox(1)()"
+  assert_line --index 0 --partial "toolbox(1)"
+  assert_line --index 0 --partial "General Commands Manual"
 }
 
 @test "help: Run command 'help' with no man present" {