diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/pthread_sigmask/18-1.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/pthread_sigmask/18-1.c
index 495f75007b..26526c5304 100644
--- a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/pthread_sigmask/18-1.c
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/pthread_sigmask/18-1.c
@@ -184,7 +184,7 @@ void * test( void * arg )
 	sigset_t set;
 	int i, j=0;
 	int signals[] = { SIGBUS, SIGKILL, SIGABRT, SIGCHLD, SIGHUP };
-#define NSIG (sizeof(signals)/sizeof(int))
+#define NUM_SIGNALS (sizeof(signals)/sizeof(int))
 	int operation[] = {SIG_SETMASK, SIG_BLOCK, SIG_UNBLOCK};
 
 	ret = sigemptyset( &set );
@@ -210,10 +210,10 @@ void * test( void * arg )
 		for ( i = 0; i < 3; i++ )
 		{
 			j++;
-			j %= 2 * NSIG;
+			j %= 2 * NUM_SIGNALS;
 
-			if ( j >= NSIG )
-				ret = sigdelset( &set, signals[ j - NSIG ] );
+			if ( j >= NUM_SIGNALS )
+				ret = sigdelset( &set, signals[ j - NUM_SIGNALS ] );
 			else
 				ret = sigaddset( &set, signals[ j ] );
 
diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sem_unlink/5-1.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sem_unlink/5-1.c
index 91dd140329..4dc28e7114 100644
--- a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sem_unlink/5-1.c
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sem_unlink/5-1.c
@@ -93,6 +93,8 @@ int main( int argc, char * argv[] )
 {
 	int ret, error;
 	sem_t * sem;
+#undef PATH_MAX
+#undef NAME_MAX
 	long PATH_MAX, NAME_MAX;
 	char * sem_name;