diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4e4eb0b..6c9b7b8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -125,7 +125,7 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-isnanl-nolibm$(EXEEXT) test-iswblank$(EXEEXT) \
 	test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \
 	test-locale$(EXEEXT) test-localename$(EXEEXT) \
-	test-rwlock1$(EXEEXT) test-lock$(EXEEXT) test-once1$(EXEEXT) \
+	test-lock$(EXEEXT) test-once1$(EXEEXT) \
 	test-once2$(EXEEXT) test-malloca$(EXEEXT) test-math$(EXEEXT) \
 	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
 	test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \
@@ -143,7 +143,7 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-striconveh$(EXEEXT) test-striconveha$(EXEEXT) \
 	test-string$(EXEEXT) test-strncat$(EXEEXT) \
 	test-strstr$(EXEEXT) test-sys_types$(EXEEXT) test-init.sh \
-	test-thread_self$(EXEEXT) test-thread_create$(EXEEXT) \
+	test-thread_self$(EXEEXT) \
 	test-time$(EXEEXT) test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
 	unicase/test-locale-language.sh test-uc_tolower$(EXEEXT) \
 	test-uc_totitle$(EXEEXT) test-uc_toupper$(EXEEXT) \
@@ -413,7 +413,7 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-isnanf-nolibm$(EXEEXT) test-isnanl-nolibm$(EXEEXT) \
 	test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \
 	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
-	test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \
+	test-localename$(EXEEXT) \
 	test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \
 	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc$(EXEEXT) \
 	test-mbrtowc-w32$(EXEEXT) test-mbsinit$(EXEEXT) \
@@ -430,7 +430,7 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
 	test-strncat$(EXEEXT) test-strstr$(EXEEXT) \
 	test-sys_types$(EXEEXT) test-thread_self$(EXEEXT) \
-	test-thread_create$(EXEEXT) test-time$(EXEEXT) \
+	test-time$(EXEEXT) \
 	test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
 	test-locale-language$(EXEEXT) test-uc_tolower$(EXEEXT) \
 	test-uc_totitle$(EXEEXT) test-uc_toupper$(EXEEXT) \
@@ -1765,9 +1765,6 @@ test_raise_OBJECTS = test-raise.$(OBJEXT)
 test_raise_LDADD = $(LDADD)
 test_raise_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
 	$(am__DEPENDENCIES_1)
-test_rwlock1_SOURCES = test-rwlock1.c
-test_rwlock1_OBJECTS = test-rwlock1.$(OBJEXT)
-test_rwlock1_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_scripts_OBJECTS = unictype/test-scripts.$(OBJEXT)
 test_scripts_OBJECTS = $(am_test_scripts_OBJECTS)
 test_scripts_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1883,9 +1880,6 @@ test_sys_types_OBJECTS = test-sys_types.$(OBJEXT)
 test_sys_types_LDADD = $(LDADD)
 test_sys_types_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_thread_create_SOURCES = test-thread_create.c
-test_thread_create_OBJECTS = test-thread_create.$(OBJEXT)
-test_thread_create_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_thread_self_SOURCES = test-thread_self.c
 test_thread_self_OBJECTS = test-thread_self.$(OBJEXT)
 test_thread_self_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -2907,7 +2901,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_xid_start_SOURCES) $(test_pr_zero_width_SOURCES) \
 	test-printf-frexp.c test-printf-frexpl.c \
 	test-pthread_sigmask1.c test-pthread_sigmask2.c test-raise.c \
-	test-rwlock1.c $(test_scripts_SOURCES) test-setenv.c \
+	$(test_scripts_SOURCES) test-setenv.c \
 	test-setlocale1.c test-setlocale2.c test-signal-h.c \
 	test-signbit.c test-sigprocmask.c test-sleep.c test-stdalign.c \
 	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
@@ -2916,7 +2910,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-strstr.c $(test_sy_c_ident_SOURCES) \
 	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
 	$(test_sy_java_whitespace_SOURCES) test-sys_types.c \
-	test-thread_create.c test-thread_self.c test-time.c \
+	test-thread_self.c test-time.c \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
 	$(test_u16_casecoll_SOURCES) $(test_u16_casefold_SOURCES) \
 	$(test_u16_check_SOURCES) $(test_u16_chr_SOURCES) \
@@ -3190,7 +3184,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_xid_start_SOURCES) $(test_pr_zero_width_SOURCES) \
 	test-printf-frexp.c test-printf-frexpl.c \
 	test-pthread_sigmask1.c test-pthread_sigmask2.c test-raise.c \
-	test-rwlock1.c $(test_scripts_SOURCES) test-setenv.c \
+	$(test_scripts_SOURCES) test-setenv.c \
 	test-setlocale1.c test-setlocale2.c test-signal-h.c \
 	test-signbit.c test-sigprocmask.c test-sleep.c test-stdalign.c \
 	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
@@ -3199,7 +3193,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-strstr.c $(test_sy_c_ident_SOURCES) \
 	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
 	$(test_sy_java_whitespace_SOURCES) test-sys_types.c \
-	test-thread_create.c test-thread_self.c test-time.c \
+	test-thread_self.c test-time.c \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
 	$(test_u16_casecoll_SOURCES) $(test_u16_casefold_SOURCES) \
 	$(test_u16_check_SOURCES) $(test_u16_chr_SOURCES) \
@@ -4783,7 +4777,7 @@ EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c macros.h btowc.c \
 	nan.h macros.h test-isnanl-nolibm.c test-isnanl.h minus-zero.h \
 	infinity.h nan.h macros.h test-iswblank.c macros.h \
 	test-langinfo.c test-limits-h.c locale.in.h test-locale.c \
-	test-localename.c macros.h test-rwlock1.c test-lock.c \
+	test-localename.c macros.h test-lock.c \
 	test-once.c test-malloca.c test-math.c macros.h \
 	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
 	test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc.c \
@@ -4812,7 +4806,7 @@ EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c macros.h btowc.c \
 	macros.h test-string.c test-strncat.c unistr/test-strncat.h \
 	zerosize-ptr.h signature.h macros.h test-strstr.c \
 	zerosize-ptr.h signature.h macros.h test-sys_types.c init.sh \
-	test-init.sh test-thread_self.c test-thread_create.c macros.h \
+	test-init.sh test-thread_self.c macros.h \
 	time.in.h test-time.c unicase/test-cased.c \
 	unicase/test-predicate-part1.h unicase/test-predicate-part2.h \
 	macros.h unicase/test-ignorable.c \
@@ -5512,7 +5506,6 @@ test_frexpl_nolibm_SOURCES = test-frexpl.c randoml.c
 test_getprogname_LDADD = $(LDADD)
 test_iconv_LDADD = $(LDADD) @LIBICONV@
 test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
-test_rwlock1_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
 test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
 test_once1_SOURCES = test-once.c
 test_once1_LDADD = $(LDADD) @LIBTHREAD@
@@ -5549,7 +5542,6 @@ test_striconveh_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_striconveha_SOURCES = test-striconveha.c iconvsupport.c
 test_striconveha_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
-test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@
 test_cased_SOURCES = unicase/test-cased.c
 test_cased_LDADD = $(LDADD) $(LIBUNISTRING)
 test_ignorable_SOURCES = unicase/test-ignorable.c
@@ -7816,9 +7808,6 @@ test-raise$(EXEEXT): $(test_raise_OBJECTS) $(test_raise_DEPENDENCIES) $(EXTRA_te
 	@rm -f test-raise$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_raise_OBJECTS) $(test_raise_LDADD) $(LIBS)
 
-test-rwlock1$(EXEEXT): $(test_rwlock1_OBJECTS) $(test_rwlock1_DEPENDENCIES) $(EXTRA_test_rwlock1_DEPENDENCIES) 
-	@rm -f test-rwlock1$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_rwlock1_OBJECTS) $(test_rwlock1_LDADD) $(LIBS)
 unictype/test-scripts.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
 
@@ -7930,10 +7919,6 @@ test-sys_types$(EXEEXT): $(test_sys_types_OBJECTS) $(test_sys_types_DEPENDENCIES
 	@rm -f test-sys_types$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_sys_types_OBJECTS) $(test_sys_types_LDADD) $(LIBS)
 
-test-thread_create$(EXEEXT): $(test_thread_create_OBJECTS) $(test_thread_create_DEPENDENCIES) $(EXTRA_test_thread_create_DEPENDENCIES) 
-	@rm -f test-thread_create$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_thread_create_OBJECTS) $(test_thread_create_LDADD) $(LIBS)
-
 test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES) 
 	@rm -f test-thread_self$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_thread_self_OBJECTS) $(test_thread_self_LDADD) $(LIBS)
@@ -9498,7 +9483,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pthread_sigmask1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pthread_sigmask2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-raise.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rwlock1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setlocale1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setlocale2.Po@am__quote@
@@ -9519,7 +9503,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strncat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strstr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_types.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_create.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_self.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unistd.Po@am__quote@
@@ -10465,13 +10448,6 @@ test-localename.log: test-localename$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-rwlock1.log: test-rwlock1$(EXEEXT)
-	@p='test-rwlock1$(EXEEXT)'; \
-	b='test-rwlock1'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-lock.log: test-lock$(EXEEXT)
 	@p='test-lock$(EXEEXT)'; \
 	b='test-lock'; \
@@ -10780,13 +10756,6 @@ test-thread_self.log: test-thread_self$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-thread_create.log: test-thread_create$(EXEEXT)
-	@p='test-thread_create$(EXEEXT)'; \
-	b='test-thread_create'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-time.log: test-time$(EXEEXT)
 	@p='test-time$(EXEEXT)'; \
 	b='test-time'; \