diff --git a/mozilla/nsprpub/pr/tests/Makefile.in b/mozilla/nsprpub/pr/tests/Makefile.in
index b2fa391b54c..658d7c03ca7 100644
--- a/mozilla/nsprpub/pr/tests/Makefile.in
+++ b/mozilla/nsprpub/pr/tests/Makefile.in
@@ -147,6 +147,7 @@ CSRCS =             \
 	prpollml.c		\
 	ranfile.c       \
 	randseed.c      \
+	reinit.c        \
 	rmdir.c			\
 	rwlocktest.c    \
 	sel_spd.c  		\
diff --git a/mozilla/nsprpub/pr/tests/reinit.c b/mozilla/nsprpub/pr/tests/reinit.c
new file mode 100644
index 00000000000..8150021c80e
--- /dev/null
+++ b/mozilla/nsprpub/pr/tests/reinit.c
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape Portable Runtime (NSPR).
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ludovico Cavedon <ludovico.cavedon@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* This test verifies that NSPR can be cleaned up and reinitialized. */
+
+#include "nspr.h"
+#include <stdio.h>
+
+int main()
+{
+    PRStatus rv;
+
+    fprintf(stderr, "Init 1\n");
+    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
+    fprintf(stderr, "Cleanup 1\n");
+    rv = PR_Cleanup();
+    if (rv != PR_SUCCESS) {
+        fprintf(stderr, "FAIL\n");
+        return 1;
+    }
+
+    fprintf(stderr, "Init 2\n");
+    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
+    fprintf(stderr, "Cleanup 2\n");
+    rv = PR_Cleanup();
+    if (rv != PR_SUCCESS) {
+        fprintf(stderr, "FAIL\n");
+        return 1;
+    }
+
+    fprintf(stderr, "PASS\n");
+    return 0;
+}
diff --git a/mozilla/nsprpub/pr/tests/runtests.pl b/mozilla/nsprpub/pr/tests/runtests.pl
index 912c6301854..92da1d28e46 100755
--- a/mozilla/nsprpub/pr/tests/runtests.pl
+++ b/mozilla/nsprpub/pr/tests/runtests.pl
@@ -348,6 +348,7 @@ $prog = shift;  # Program to test
 "prpollml",
 "ranfile",
 "randseed",
+"reinit",
 "rwlocktest",
 "sel_spd",
 "selct_er",
diff --git a/mozilla/nsprpub/pr/tests/runtests.sh b/mozilla/nsprpub/pr/tests/runtests.sh
index a31b261e98b..1bfa8301bcc 100755
--- a/mozilla/nsprpub/pr/tests/runtests.sh
+++ b/mozilla/nsprpub/pr/tests/runtests.sh
@@ -176,6 +176,7 @@ provider
 prpollml
 ranfile
 randseed
+reinit
 rwlocktest
 sel_spd
 selct_er