diff --git a/test/lib/brick-shelltest.h b/test/lib/brick-shelltest.h
index afd1fc9a4..01d000f26 100644
--- a/test/lib/brick-shelltest.h
+++ b/test/lib/brick-shelltest.h
@@ -177,7 +177,7 @@ public:
     }
 };
 
-static void _fsync_name( std::string n )
+static void _fsync_name( const std::string &n )
 {
     int fd = open( n.c_str(), O_WRONLY );
     if ( fd >= 0 ) {
@@ -1400,7 +1400,7 @@ static int run( int argc, const char **argv, std::string fl_envvar = "TEST_FLAVO
     Options opt;
     const char *env;
 
-    if ( args.has( "--help" ) ) {
+    if ( args.has( "--help" ) || args.has( "-h" ) || args.has( "-?" ) ) {
         std::cout <<
             "  lvm2-testsuite - Run a lvm2 testsuite.\n\n"
             "lvm2-testsuite"
@@ -1538,6 +1538,11 @@ static int run( int argc, const char **argv, std::string fl_envvar = "TEST_FLAVO
     opt.workdir = resolve_path( args.opt( "--workdir" ), opt.testdir.c_str() );
     opt.outdir = resolve_path( args.opt( "--outdir" ), "." );
 
+    if (getuid() != 0) {
+        std::cout << "Skipping tests, root is required, current UID: " << getuid() << "\n";
+        return 0;
+    }
+
     setup_handlers();
 
     Main main( opt );
diff --git a/test/lib/runner.cpp b/test/lib/runner.cpp
index d522228a0..d00aa457c 100644
--- a/test/lib/runner.cpp
+++ b/test/lib/runner.cpp
@@ -29,12 +29,6 @@
 
 int main(int argc, const char **argv)
 {
-
-    if (getuid() != 0) {
-        std::cout << "Skipping tests, root is required, current UID: " << getuid() << "\n";
-        return 0;
-    }
-
     try {
         return brick::shelltest::run( argc, argv, "LVM_TEST_FLAVOUR" );
     } catch (std::exception const& e) {