diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in
index 62a02feea54..39efdf3f635 100644
--- a/icu4c/source/Makefile.in
+++ b/icu4c/source/Makefile.in
@@ -106,7 +106,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi
 	fi
 
 clean-recursive-with-twist:
-	$(MAKE) clean-recursive LOCAL_SUBDIRS='$(CLEAN_FIRST_SUBDIRS) $(filter-out tools,$($(CLEAN_FIRST_SUBDIRS)))'
+	$(MAKE) clean-recursive LOCAL_SUBDIRS='$(CLEAN_FIRST_SUBDIRS) $(filter-out $(CLEAN_FIRST_SUBDIRS),$(LOCAL_SUBDIRS))'
 
 all-local: $(srcdir)/configure
 
diff --git a/icu4c/source/tools/Makefile.in b/icu4c/source/tools/Makefile.in
index b9da9f7490e..0eaddfea629 100644
--- a/icu4c/source/tools/Makefile.in
+++ b/icu4c/source/tools/Makefile.in
@@ -194,7 +194,7 @@ $(TMPDATADIR)/icupkg.inc: pkgdata/icupkg.inc
 
 # build the ICU and test data
 
-build-local build-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/testdata.lst  $(TMPDATADIR)/icupkg.inc $(DATAFILES) $(DATABUILDDIR)/test.dat
+build-local build-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/testdata.lst  $(TMPDATADIR)/icupkg.inc $(DATAFILES) 
 	@$(mkinstalldirs) $(TMPDATADIR)
 	(cd $(TMPDATADIR); $(PKGDATA) -p icudata ./icudata.lst   )
 	(cd $(TMPDATADIR); $(PKGDATA) -p testdat1  ./testdata.lst )