diff --git a/src/program_options/Parser.cpp b/src/program_options/Parser.cpp
index 085efd0d..df49b4ad 100644
--- a/src/program_options/Parser.cpp
+++ b/src/program_options/Parser.cpp
@@ -90,7 +90,7 @@ void Parser::_addPositionalOptionForBaseDir(po::options_description *desc, po::p
 }
 
 [[noreturn]] void Parser::_showHelpAndExit() {
-    cerr << "Usage: cryfs --config configFile [other options] rootDir mountPoint [-- [FUSE Mount Options]]\n";
+    cerr << "Usage: cryfs [options] rootDir mountPoint [-- [FUSE Mount Options]]\n";
     po::options_description desc;
     _addAllowedOptions(&desc);
     cerr << desc << endl;
diff --git a/test/program_options/ParserTest.cpp b/test/program_options/ParserTest.cpp
index 37bed5cb..6cbdee62 100644
--- a/test/program_options/ParserTest.cpp
+++ b/test/program_options/ParserTest.cpp
@@ -53,12 +53,12 @@ TEST_F(ProgramOptionsParserTest, NoSpecialOptions) {
 }
 
 TEST_F(ProgramOptionsParserTest, LogfileGiven) {
-    ProgramOptions options = parse({"./myExecutable", "/home/user/baseDir", "--logfile", "/home/user/logfile", "/home/user/mountDir"});
+    ProgramOptions options = parse({"./myExecutable", "/home/user/baseDir", "--logfile", "/home/user/mylogfile", "/home/user/mountDir"});
     EXPECT_EQ("/home/user/mylogfile", options.logFile().value());
 }
 
 TEST_F(ProgramOptionsParserTest, ConfigfileGiven) {
-    ProgramOptions options = parse({"./myExecutable", "/home/user/baseDir", "--configfile", "/home/user/configfile", "/home/user/mountDir"});
+    ProgramOptions options = parse({"./myExecutable", "/home/user/baseDir", "--config", "/home/user/myconfigfile", "/home/user/mountDir"});
     EXPECT_EQ("/home/user/myconfigfile", options.configFile().value());
 }