diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c
index 99540bc5a7b..01b4875467f 100644
--- a/icu4c/source/test/cintltst/creststn.c
+++ b/icu4c/source/test/cintltst/creststn.c
@@ -844,7 +844,9 @@ static void TestEmptyBundle(){
 static void TestBinaryCollationData(){
     UErrorCode status=U_ZERO_ERROR;
     const char*      locale="te";
+#if !UCONFIG_NO_COLLATION 
     const char* testdatapath;
+#endif
     UResourceBundle *teRes = NULL;
     UResourceBundle *coll=NULL;
     UResourceBundle *binColl = NULL;
@@ -1920,10 +1922,12 @@ static void TestResourceLevelAliasing(void) {
     const UChar *string = NULL, *sequence = NULL;
     const uint8_t *binary = NULL, *binSequence = NULL;
     int32_t strLen = 0, seqLen = 0, binLen = 0, binSeqLen = 0;
-    
+
+#if !UCONFIG_NO_COLLATION 
     char buffer[100];
     char *s;
-    
+#endif
+
     testdatapath=loadTestData(&status);
     if(U_FAILURE(status))
     {
diff --git a/icu4c/source/test/cintltst/idnatest.c b/icu4c/source/test/cintltst/idnatest.c
index 96a5e1a0e6b..328ba915c5d 100644
--- a/icu4c/source/test/cintltst/idnatest.c
+++ b/icu4c/source/test/cintltst/idnatest.c
@@ -13,12 +13,12 @@
  *   created on: 2003jul11
  *   created by: Ram Viswanadha
  */
-
-#if !UCONFIG_NO_IDNA
-
 #include <stdlib.h>
 #include <string.h>
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_IDNA
+
 #include "unicode/ustring.h"
 #include "unicode/uidna.h"
 #include "cintltst.h"
diff --git a/icu4c/source/test/cintltst/nfsprep.c b/icu4c/source/test/cintltst/nfsprep.c
index 993e3a4f54c..ca18ae3f8c3 100644
--- a/icu4c/source/test/cintltst/nfsprep.c
+++ b/icu4c/source/test/cintltst/nfsprep.c
@@ -13,6 +13,9 @@
  *   created on: 2003jul11
  *   created by: Ram Viswanadha
  */
+
+#include "unicode/utypes.h"
+
 #if !UCONFIG_NO_IDNA
 
 #include "nfsprep.h"
diff --git a/icu4c/source/test/cintltst/nfsprep.h b/icu4c/source/test/cintltst/nfsprep.h
index af1263949b6..fe3e63d5429 100644
--- a/icu4c/source/test/cintltst/nfsprep.h
+++ b/icu4c/source/test/cintltst/nfsprep.h
@@ -16,9 +16,10 @@
 #ifndef _NFSPREP_H
 #define _NFSPREP_H
 
+#include "unicode/utypes.h"
+
 #if !UCONFIG_NO_IDNA
 
-#include "unicode/utypes.h"
 #include "unicode/ustring.h"
 #include "unicode/usprep.h"
 #include <stdlib.h>
diff --git a/icu4c/source/test/cintltst/spreptst.c b/icu4c/source/test/cintltst/spreptst.c
index 01aa7ac6288..dc9a4cc6d6c 100644
--- a/icu4c/source/test/cintltst/spreptst.c
+++ b/icu4c/source/test/cintltst/spreptst.c
@@ -13,11 +13,12 @@
  *   created on: 2003jul11
  *   created by: Ram Viswanadha
  */
-#if !UCONFIG_NO_IDNA
-
 #include <stdlib.h>
 #include <string.h>
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_IDNA
+
 #include "unicode/ustring.h"
 #include "unicode/usprep.h"
 #include "cintltst.h"
diff --git a/icu4c/source/test/cintltst/sprpdata.c b/icu4c/source/test/cintltst/sprpdata.c
index 6123cfa8088..97004ce5f0b 100644
--- a/icu4c/source/test/cintltst/sprpdata.c
+++ b/icu4c/source/test/cintltst/sprpdata.c
@@ -13,11 +13,12 @@
  *   created on: 2003jul11
  *   created by: Ram Viswanadha
  */
-#if !UCONFIG_NO_IDNA
-
 #define USPREP_TYPE_NAMES_ARRAY
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_IDNA
+
 #include "unicode/ustring.h"
 #include "cintltst.h"
 #include "unicode/usprep.h"
diff --git a/icu4c/source/test/intltest/convtest.cpp b/icu4c/source/test/intltest/convtest.cpp
index 3a9d6c28f99..03478b60509 100644
--- a/icu4c/source/test/intltest/convtest.cpp
+++ b/icu4c/source/test/intltest/convtest.cpp
@@ -17,6 +17,18 @@
 */
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
+/*
+ * Note: Turning off all of convtest.cpp if !UCONFIG_NO_LEGACY_CONVERSION
+ * is slightly unnecessary - it removes tests for Unicode charsets
+ * like UTF-8 that should work.
+ * However, there is no easy way for the test to detect whether a test case
+ * is for a Unicode charset, so it would be difficult to only exclude those.
+ * Also, regular testing of ICU is done with all modules on, therefore
+ * not testing conversion for a custom configuration like this should be ok.
+ */
+
 #include "unicode/ucnv.h"
 #include "unicode/unistr.h"
 #include "unicode/parsepos.h"
@@ -1214,3 +1226,5 @@ ConversionTest::checkFromUnicode(ConversionCase &cc, UConverter *cnv, const char
         return FALSE;
     }
 }
+
+#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */
diff --git a/icu4c/source/test/intltest/convtest.h b/icu4c/source/test/intltest/convtest.h
index d7805d97d74..b98aec0c492 100644
--- a/icu4c/source/test/intltest/convtest.h
+++ b/icu4c/source/test/intltest/convtest.h
@@ -20,6 +20,9 @@
 #define __CONVTEST_H__
 
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
+
 #include "unicode/ucnv.h"
 #include "intltest.h"
 
@@ -83,4 +86,6 @@ private:
     cnv_open(const char *name, UErrorCode &errorCode);
 };
 
+#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */
+
 #endif
diff --git a/icu4c/source/test/intltest/itmajor.cpp b/icu4c/source/test/intltest/itmajor.cpp
index b75ac7d8d07..361fa8d4911 100644
--- a/icu4c/source/test/intltest/itmajor.cpp
+++ b/icu4c/source/test/intltest/itmajor.cpp
@@ -149,11 +149,13 @@ void MajorTestLevel::runIndexedTest( int32_t index, UBool exec, const char* &nam
 #endif
             break;
         case 11: name = "convert";
+#if !UCONFIG_NO_LEGACY_CONVERSION
                 if (exec) {
                     logln("TestSuite Conversion---"); logln();
                     ConversionTest test;
                     callTest( test, par );
                 }
+#endif
                 break;
 
         default: name = ""; break;