diff --git a/src/app/main.cpp b/src/app/main.cpp
index 49b628d1..50d69bf5 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -234,24 +234,9 @@ int main(int argc, char *argv[])
 
 		std::shared_ptr<LicenseChecker> checker = LicenseChecker::getInstance();
 
-#ifdef _WIN32
 		signal(SIGINT, signalHandler);
 		signal(SIGTERM, signalHandler);
 		signal(SIGABRT, signalHandler);
-#else
-		struct sigaction sa;
-		sa.sa_handler = signalHandler;
-		sigemptyset(&sa.sa_mask);
-		sa.sa_flags = SA_RESTART;
-		if (sigaction(SIGINT, &sa, NULL))
-		{
-			std::cout << "Cant install SIGINT handler" << std::endl;
-		}
-		if (sigaction(SIGHUP, &sa, NULL))
-		{
-			std::cout << "Cant install SIGHUP handler" << std::endl;
-		}
-#endif
 
 		commandLineParser.parse();
 		if (commandLineParser.startedWithLicense())
@@ -286,6 +271,7 @@ int main(int argc, char *argv[])
 				commandLineParser.getFullProjectRefresh()
 			).dispatch();
 		}
+
 		return qtApp.exec();
 	}
 	else
diff --git a/src/test/CommandlineTestSuite.h b/src/test/CommandlineTestSuite.h
index 8c7fc9ce..97ee61ab 100644
--- a/src/test/CommandlineTestSuite.h
+++ b/src/test/CommandlineTestSuite.h
@@ -73,10 +73,15 @@ public:
 			"/opt/testpath/mvn"
 		});
 
+		std::stringstream redStream;
+		auto oldBuf = std::cout.rdbuf( redStream.rdbuf() );
+
 		commandline::CommandLineParser parser("2");
 		parser.preparse(args);
 		parser.parse();
 
+		std::cout.rdbuf( oldBuf );
+
 		FilePath path = ApplicationSettings::getInstance()->getMavenPath();
 		TS_ASSERT_EQUALS( path.str(), "/opt/testpath/mvn")