diff --git a/test/jdk/sun/management/jmxremote/bootstrap/exelauncher.c b/test/jdk/sun/management/jmxremote/bootstrap/exelauncher.c
index 46f30d9e157..dc4971fed02 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/exelauncher.c
+++ b/test/jdk/sun/management/jmxremote/bootstrap/exelauncher.c
@@ -61,8 +61,9 @@ int main(int argc, char**argv) {
         fprintf(stderr, "Usage: %s jvm-path classpath class\n", argv[0]);
         return -1;
      }
-     cp_prop = (char*)malloc(strlen(CP_PROP)+strlen(argv[2]) +1);
-     sprintf(cp_prop, "%s%s", CP_PROP, argv[2]);
+     size_t propLen = strlen(CP_PROP) + strlen(argv[2]) + 1;
+     cp_prop = (char*)malloc(propLen);
+     snprintf(cp_prop, propLen, "%s%s", CP_PROP, argv[2]);
 
      options[0].optionString = cp_prop;
      vm_args.version = 0x00010002;
diff --git a/test/jdk/sun/management/windows/exerevokeall.c b/test/jdk/sun/management/windows/exerevokeall.c
index 16c932f9b02..ac6f6183dbb 100644
--- a/test/jdk/sun/management/windows/exerevokeall.c
+++ b/test/jdk/sun/management/windows/exerevokeall.c
@@ -99,12 +99,13 @@ static char *getTextualSid(SID* sid) {
     }
 
     // S-SID_REVISION
-    sprintf(name, "S-%lu-", SID_REVISION );
+    snprintf(name, len, "S-%lu-", SID_REVISION );
 
     // Identifier authority
     if ((sia->Value[0] != 0) || (sia->Value[1] != 0))
     {
-        sprintf(name + strlen(name), "0x%02hx%02hx%02hx%02hx%02hx%02hx",
+        snprintf(name + strlen(name), len - strlen(name),
+                "0x%02hx%02hx%02hx%02hx%02hx%02hx",
                 (USHORT)sia->Value[0],
                 (USHORT)sia->Value[1],
                 (USHORT)sia->Value[2],
@@ -114,7 +115,7 @@ static char *getTextualSid(SID* sid) {
     }
     else
     {
-        sprintf(name + strlen(name), "%lu",
+        snprintf(name + strlen(name), len - strlen(name), "%lu",
                 (ULONG)(sia->Value[5]      )   +
                 (ULONG)(sia->Value[4] <<  8)   +
                 (ULONG)(sia->Value[3] << 16)   +
@@ -123,7 +124,7 @@ static char *getTextualSid(SID* sid) {
 
     // finally, the sub-authorities
     for (i=0 ; i<count; i++) {
-        sprintf(name + strlen(name), "-%lu",
+        snprintf(name + strlen(name), len - strlen(name), "-%lu",
                 *GetSidSubAuthority(sid, i) );
     }