diff --git a/src/OSD/OSD_Chronometer.cxx b/src/OSD/OSD_Chronometer.cxx
index 6153aafda9..bbedf8aa6b 100644
--- a/src/OSD/OSD_Chronometer.cxx
+++ b/src/OSD/OSD_Chronometer.cxx
@@ -57,7 +57,7 @@
 //=======================================================================
 void OSD_Chronometer::GetProcessCPU (Standard_Real& UserSeconds, Standard_Real& SystemSeconds)
 {
-#if defined(__linux__) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__QNX__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__QNX__)
   static const long aCLK_TCK = sysconf(_SC_CLK_TCK);
 #else
   static const long aCLK_TCK = CLK_TCK;
diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx
index 6f0451a343..365831ad29 100644
--- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx
@@ -615,7 +615,7 @@ LONG _osd_debug ( void ) {
 // POSIX threads
 #include <pthread.h>
 
-#ifdef linux
+#ifdef __linux__
 #include <fenv.h>
 static Standard_Boolean fFltExceptions = Standard_False;
 #endif
@@ -798,7 +798,7 @@ static void Handler (const int theSignal)
   // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " <<  endl ;
   if ( ADR_ACT_SIGIO_HANDLER != NULL )
     (*ADR_ACT_SIGIO_HANDLER)() ;
-#ifdef linux
+#ifdef __linux__
   if (fFltExceptions)
     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
@@ -922,7 +922,7 @@ static void SegvHandler(const int theSignal,
   (void)theSignal; // silence GCC warnings
   (void)theContext;
 #endif
-#ifdef linux
+#ifdef __linux__
   if (fFltExceptions)
     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
@@ -1009,7 +1009,7 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal)
       cerr << "ieee_handler does not work !!! KO " << endl;
 #endif
     }
-#elif defined (linux)
+#elif defined (__linux__)
     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
     fFltExceptions = Standard_True;
@@ -1096,7 +1096,7 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal)
 	sigaction(SIGBUS,&oact,&oact);
 #endif
 
-#if (!defined (linux)) && (!defined(__linux__))
+#if !defined(__linux__)
   sigaction(SIGSYS,&act,&oact);   // ...... bad argument to system call
 
 # ifdef OBJS
diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx
index 2c1d49d2db..0a9849907d 100644
--- a/src/QABugs/QABugs_11.cxx
+++ b/src/QABugs/QABugs_11.cxx
@@ -2452,7 +2452,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co
     }
     catch(Standard_NumericError) // Linux, Windows with SSE2
     {
-      di << "Exception is caught, OK\n";
+      di << "Caught, OK\n";
     }
     catch(Standard_Failure) {
       //cout << " Caught (" << Standard_Failure::Caught() << ")... KO" << endl;
diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx
index f188393bb2..387dae6322 100644
--- a/src/Standard/Standard_MMgrOpt.cxx
+++ b/src/Standard/Standard_MMgrOpt.cxx
@@ -249,7 +249,7 @@ void Standard_MMgrOpt::Initialize()
       perror("ERR_MEMRY_FAIL");
 #endif
     
-#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__)
+#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__)
     if ((myMMap = open ("/dev/zero", O_RDWR)) < 0) {
       if ((myMMap = open ("/dev/null", O_RDWR)) < 0){
         myMMap = 0;
diff --git a/tests/bugs/fclasses/bug6143 b/tests/bugs/fclasses/bug6143
index a3bbb06c77..0fa01f923d 100644
--- a/tests/bugs/fclasses/bug6143
+++ b/tests/bugs/fclasses/bug6143
@@ -1,6 +1,4 @@
 puts "TODO OCC24156 MacOS: Faulty OCC6143"
-puts "TODO OCC27713 Linux: Faulty OCC6143"
-puts "TODO OCC27713 Linux: Error"
 
 puts "================"
 puts "OCC1723"
@@ -10,8 +8,7 @@ puts "OCC12131"
 puts "================"
 puts ""
 #######################################################################################
-# OSD::SetSignal : not all FLT exceptions are catched
-# Correct handling of exceptions on WNT
+# OSD::SetSignal : not all FLT exceptions are caught
 #######################################################################################
 
 pload QAcommands
diff --git a/tests/bugs/modalg_6/bug27842 b/tests/bugs/modalg_6/bug27842
old mode 100644
new mode 100755
index b43867ce90..e55c77dcff
--- a/tests/bugs/modalg_6/bug27842
+++ b/tests/bugs/modalg_6/bug27842
@@ -6,12 +6,7 @@ puts ""
 # Exception in intersection algorithm if FPE is switched on
 ######################################################
 
-puts "TODO OCC26329 ALL: Error: dsetsignal command does not exist"
-
-# This "if" should be deleted after integration the fix for issue #26329
-if { [catch { dsetsignal 1 } ] } {
-  puts "Error: dsetsignal command does not exist"
-}
+dsetsignal 1
 
 restore [locate_data_file bug27842_shape1_fix.brep] b1 
 restore [locate_data_file bug27842_shape2_fix.brep] b2