diff --git a/src/tests/system/libroot/posix/Jamfile b/src/tests/system/libroot/posix/Jamfile
index 254a7fde1c..01aae3abc7 100644
--- a/src/tests/system/libroot/posix/Jamfile
+++ b/src/tests/system/libroot/posix/Jamfile
@@ -25,3 +25,4 @@ SEARCH on [ FGristFiles
 
 SubInclude HAIKU_TOP src tests system libroot posix bonnie ;
 SubInclude HAIKU_TOP src tests system libroot posix math ;
+SubInclude HAIKU_TOP src tests system libroot posix posixtestsuite ;
diff --git a/src/tests/system/libroot/posix/posixtestsuite/Jamfile b/src/tests/system/libroot/posix/posixtestsuite/Jamfile
new file mode 100644
index 0000000000..9a9b52a9ea
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/Jamfile
@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src tests system libroot posix posixtestsuite ;
+
+SubInclude HAIKU_TOP src tests system libroot posix posixtestsuite conformance ;
diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/Jamfile b/src/tests/system/libroot/posix/posixtestsuite/conformance/Jamfile
new file mode 100644
index 0000000000..187d08451a
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/Jamfile
@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src tests system libroot posix posixtestsuite conformance ;
+
+SubInclude HAIKU_TOP src tests system libroot posix posixtestsuite conformance interfaces ;
diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/Jamfile b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/Jamfile
new file mode 100644
index 0000000000..69d9561dd6
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/Jamfile
@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src tests system libroot posix posixtestsuite conformance interfaces ;
+
+SubInclude HAIKU_TOP src tests system libroot posix posixtestsuite conformance interfaces sigprocmask ;
diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/12-1.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/12-1.c
new file mode 100644
index 0000000000..da5a96a8b6
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/12-1.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2003, Intel Corporation. All rights reserved.
+ * Created by:  salwan.searty REMOVE-THIS AT intel DOT com
+ * This file is licensed under the GPL license.  For the full content
+ * of this license, see the COPYING file at the top level of this 
+ * source tree.
+
+ Steps:
+ 1. Set the signal mask to only having SIGABRT.
+ 2. Call sigprocmask again, this time with a randomly generated value of 
+ how that is checked to make sure it does not equal any of the three defined
+ values of how which are SIG_SETMASK, SIG_BLOCK, or SIG_UNBLOCK. This should
+ cause sigprocmask() to return -1. For the second parameter in the sigprocmask()
+ function, use a set which contains SIGABRT and SIGALRM.
+ 3. Now verify using the is_changed() function that the only signal that is still
+ in the signal mask is SIGABRT. Neither SIGALRM nor any other signal should be
+ in the signal mask of the process.
+
+*/
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "posixtest.h"
+
+#define NUMSIGNALS 25
+
+int is_changed(sigset_t set) {
+	
+	int i;
+	int siglist[] = {SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPOLL, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	for (i=0; i<NUMSIGNALS; i++) {
+		if (sigismember(&set, siglist[i]) != 0)
+		return 1;
+	}
+	return 0;
+}
+
+int get_rand() {
+
+	int r;
+	r=rand();
+	while ((r == SIG_BLOCK) || (r == SIG_SETMASK) || (r == SIG_UNBLOCK)) {
+		r = get_rand();
+	}
+	return r;
+}
+
+int main() {
+	
+	int r=get_rand();
+	sigset_t actl, oactl;
+
+	sigemptyset(&actl);
+	sigemptyset(&oactl);
+	sigaddset(&actl, SIGABRT);
+
+	sigprocmask(SIG_SETMASK, &actl, NULL);
+
+	sigaddset(&actl, SIGALRM);
+	if (sigprocmask(r, &actl, NULL) != -1) {
+		perror("sigprocmask() did not fail even though invalid how parameter was passed to it.\n");
+		return PTS_UNRESOLVED;
+	}
+
+	sigprocmask(SIG_SETMASK, NULL, &oactl);
+
+	if (sigismember(&oactl, SIGABRT) != 1) {
+		printf("FAIL: signal mask was changed. \n");
+		return PTS_FAIL;
+	}
+
+	if (is_changed(oactl)) {
+		printf("FAIL: signal mask was changed. \n");
+		return PTS_FAIL;
+	}
+
+	printf("PASS: signal mask was not changed.\n");
+	return PTS_PASS;
+}
diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-1.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-1.c
new file mode 100644
index 0000000000..950554ccca
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-1.c
@@ -0,0 +1,63 @@
+/*
+
+ * Copyright (c) 2003, Intel Corporation. All rights reserved.
+ * Created by:  salwan.searty REMOVE-THIS AT intel DOT com
+ * This file is licensed under the GPL license.  For the full content
+ * of this license, see the COPYING file at the top level of this 
+ * source tree.
+ 
+ Steps:
+ 1. Add only SIGABRT to the signal mask.
+ 2. Make a call such as this: sigprocmask(SIG_BLOCK, NULL, &oactl). At 
+ this point, we have obtained the signal mask in oactl.
+ 3. Now call is_changed to make sure that SIGABRT is still in oactl, and 
+ that no other signal in the set is in oactl.
+
+*/
+
+#include <signal.h>
+#include <stdio.h>
+#include "posixtest.h"
+
+#define NUMSIGNALS 26
+
+int is_changed(sigset_t set, int sig) {
+	
+	int i;
+	int siglist[] = {SIGABRT, SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPOLL, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	if (sigismember(&set, sig) != 1) {
+		return 1;
+	}
+	for (i=0; i<NUMSIGNALS; i++) {
+		if ((siglist[i] != sig)) {
+			if (sigismember(&set, siglist[i]) != 0) {
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+int main() {
+	sigset_t actl, oactl;
+
+	sigemptyset(&actl);
+	sigemptyset(&oactl);
+
+	sigaddset(&actl, SIGABRT);
+
+	sigprocmask(SIG_SETMASK, &actl, NULL);
+	sigprocmask(SIG_BLOCK, NULL, &oactl);
+	
+	if (is_changed(oactl, SIGABRT)) {
+		return PTS_FAIL;
+	}
+	printf("PASS: signal mask was not changed.\n");
+	return PTS_PASS;
+}
diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-2.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-2.c
new file mode 100644
index 0000000000..33824efebc
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-2.c
@@ -0,0 +1,64 @@
+/*
+
+ * Copyright (c) 2003, Intel Corporation. All rights reserved.
+ * Created by:  salwan.searty REMOVE-THIS AT intel DOT com
+ * This file is licensed under the GPL license.  For the full content
+ * of this license, see the COPYING file at the top level of this 
+ * source tree.
+ 
+ Steps:
+ 1. Add only SIGABRT to the signal mask.
+ 2. Make a call such as this: sigprocmask(SIG_SETMASK, NULL, &oactl). 
+At 
+ this point, we have obtained the signal mask in oactl.
+ 3. Now call is_changed to make sure that SIGABRT is still in oactl, and 
+ that no other signal in the set is in oactl.
+
+*/
+
+#include <signal.h>
+#include <stdio.h>
+#include "posixtest.h"
+
+#define NUMSIGNALS 26
+
+int is_changed(sigset_t set, int sig) {
+	
+	int i;
+	int siglist[] = {SIGABRT, SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPOLL, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	if (sigismember(&set, sig) != 1) {
+		return 1;
+	}
+	for (i=0; i<NUMSIGNALS; i++) {
+		if ((siglist[i] != sig)) {
+			if (sigismember(&set, siglist[i]) != 0) {
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+int main() {
+	sigset_t actl, oactl;
+
+	sigemptyset(&actl);
+	sigemptyset(&oactl);
+
+	sigaddset(&actl, SIGABRT);
+
+	sigprocmask(SIG_SETMASK, &actl, NULL);
+	sigprocmask(SIG_SETMASK, NULL, &oactl);
+	
+	if (is_changed(oactl, SIGABRT)) {
+		return PTS_FAIL;
+	}
+	printf("PASS: signal mask was not changed.\n");
+	return PTS_PASS;
+}
diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-3.c b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-3.c
new file mode 100644
index 0000000000..b7b1071b0b
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/8-3.c
@@ -0,0 +1,63 @@
+/*
+
+ * Copyright (c) 2003, Intel Corporation. All rights reserved.
+ * Created by:  salwan.searty REMOVE-THIS AT intel DOT com
+ * This file is licensed under the GPL license.  For the full content
+ * of this license, see the COPYING file at the top level of this 
+ * source tree.
+ 
+ Steps:
+ 1. Add only SIGABRT to the signal mask.
+ 2. Make a call such as this: sigprocmask(SIG_UNBLOCK, NULL, &oactl). At 
+ this point, we have obtained the signal mask in oactl.
+ 3. Now call is_changed to make sure that SIGABRT is still in oactl, and 
+ that no other signal in the set is in oactl.
+
+*/
+
+#include <signal.h>
+#include <stdio.h>
+#include "posixtest.h"
+
+#define NUMSIGNALS 26
+
+int is_changed(sigset_t set, int sig) {
+	
+	int i;
+	int siglist[] = {SIGABRT, SIGALRM, SIGBUS, SIGCHLD, 
+		SIGCONT, SIGFPE, SIGHUP, SIGILL, SIGINT, 
+		SIGPIPE, SIGQUIT, SIGSEGV, 
+		SIGTERM, SIGTSTP, SIGTTIN, SIGTTOU, 
+		SIGUSR1, SIGUSR2, SIGPOLL, SIGPROF, SIGSYS, 
+		SIGTRAP, SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ };
+
+	if (sigismember(&set, sig) != 1) {
+		return 1;
+	}
+	for (i=0; i<NUMSIGNALS; i++) {
+		if ((siglist[i] != sig)) {
+			if (sigismember(&set, siglist[i]) != 0) {
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+int main() {
+	sigset_t actl, oactl;
+
+	sigemptyset(&actl);
+	sigemptyset(&oactl);
+
+	sigaddset(&actl, SIGABRT);
+
+	sigprocmask(SIG_SETMASK, &actl, NULL);
+	sigprocmask(SIG_UNBLOCK, NULL, &oactl);
+	
+	if (is_changed(oactl, SIGABRT)) {
+		return PTS_FAIL;
+	}
+	printf("PASS: signal mask was not changed.\n");
+	return PTS_PASS;
+}
diff --git a/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/Jamfile b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/Jamfile
new file mode 100644
index 0000000000..4fe7864602
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/conformance/interfaces/sigprocmask/Jamfile
@@ -0,0 +1,9 @@
+SubDir HAIKU_TOP src tests system libroot posix posixtestsuite conformance interfaces sigprocmask ;
+
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) $(DOTDOT) include ] ;
+
+SimpleTest 8-1.test : 8-1.c ;
+SimpleTest 8-2.test : 8-2.c ;
+SimpleTest 8-3.test : 8-3.c ;
+SimpleTest 12-1.test : 12-1.c ;
+
diff --git a/src/tests/system/libroot/posix/posixtestsuite/include/posixtest.h b/src/tests/system/libroot/posix/posixtestsuite/include/posixtest.h
new file mode 100644
index 0000000000..60d01c0005
--- /dev/null
+++ b/src/tests/system/libroot/posix/posixtestsuite/include/posixtest.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2002, Intel Corporation. All rights reserved.
+ * Created by:  julie.n.fleischer REMOVE-THIS AT intel DOT com
+ * This file is licensed under the GPL license.  For the full content
+ * of this license, see the COPYING file at the top level of this
+ * source tree.
+ */
+
+/*
+ * return codes
+ */
+#define PTS_PASS        0
+#define PTS_FAIL        1
+#define PTS_UNRESOLVED  2
+#define PTS_UNSUPPORTED 4
+#define PTS_UNTESTED    5
+