diff --git a/test/Fortran/elpa_tests.F90 b/test/Fortran/elpa_tests.F90
index de60e1e7a6680c537db50da2a52cc2dc984d13f7..f37fd8ae930bfffb109adff846008b5f6e5f8c35 100644
--- a/test/Fortran/elpa_tests.F90
+++ b/test/Fortran/elpa_tests.F90
@@ -139,6 +139,10 @@ program test_all_real
    nev = input_options%nev
    nblk = input_options%nblk
 
+   if (input_options%justHelpMessage) then
+     call EXIT(0)
+   endif
+
 
    !-------------------------------------------------------------------------------
    !  MPI Initialization
diff --git a/test/shared/read_input_parameters.F90 b/test/shared/read_input_parameters.F90
index 4fbdf9e796e7171a5acf4cd050aaa57ee55d35de..3db148eee137ca1efb45a346cb248e6230e7a0a2 100644
--- a/test/shared/read_input_parameters.F90
+++ b/test/shared/read_input_parameters.F90
@@ -53,7 +53,7 @@ module mod_read_input_parameters
     integer        :: this_real_kernel, this_complex_kernel
     logical        :: realKernelIsSet, complexKernelIsSet
     integer        :: useQrIsSet, useGPUIsSet
-    logical        :: doSolveTridi, do1stage, do2stage
+    logical        :: doSolveTridi, do1stage, do2stage, justHelpMessage
   end type
 
   interface read_input_parameters
@@ -85,6 +85,8 @@ module mod_read_input_parameters
         print *,"                  [--output_eigenvectors] [--real-kernel=name_of_kernel]"
         print *,"                  [--complex-kernel=name_of_kernel] [--use-gpu={0|1}]"
         print *,"                  [--use-qr={0,1}] [--tests={all|solve-tridi|1stage|2stage}]"
+        input_options%justHelpMessage=.true.
+        return
       endif
 
 
@@ -208,6 +210,8 @@ module mod_read_input_parameters
       input_options%do2Stage = .true.
       input_options%doSolveTridi = .true.
 
+      input_options%justHelpMessage=.false.
+
       ! test na=1500 nev=50 nblk=16 --help --kernel --output_eigenvectors --output_eigenvalues
       if (COMMAND_ARGUMENT_COUNT() .gt. 8) then
         write(error_unit, '(a,i0,a)') "Invalid number (", COMMAND_ARGUMENT_COUNT(), ") of command line arguments!"