--- a/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetLocalVars.cpp	Tue Nov 13 13:45:43 2018 -0500
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetLocalVars.cpp	Tue Nov 13 12:11:34 2018 -0800
@@ -89,9 +89,6 @@
 
 DECL_TEST_INV_SLOT_FUNC(int, Int);
 DECL_TEST_INV_SLOT_FUNC(float, Float);
-DECL_TEST_INV_SLOT_FUNC(long, Long);
-DECL_TEST_INV_SLOT_FUNC(double, Double);
-DECL_TEST_INV_SLOT_FUNC(object, Object);
 
 DECL_TEST_TYPE_MISMATCH_FUNC(int, Int);
 DECL_TEST_TYPE_MISMATCH_FUNC(float, Float);
@@ -143,9 +140,7 @@
   printf("\n test_local_integer: BEGIN\n\n");
 
   test_int(thr, depth, slot, "int");
-  test_long_inv_slot(thr, depth, slot, "int");
   test_float(thr, depth, slot, "int");
-  test_double_inv_slot(thr, depth, slot, "int");
   test_object_type_mismatch(thr, depth, slot, "double");
 
   printf("\n test_local_integer: END\n\n");
@@ -159,7 +154,6 @@
   test_long_inv_slot(thr, depth, slot, "invalid");
   test_float_inv_slot(thr, depth, slot, "invalid");
   test_double_inv_slot(thr, depth, slot, "invalid");
-  test_object_inv_slot(thr, depth, slot, "invalid");
 
   printf("\n test_local_invalid: END\n\n");
 }
@@ -205,6 +199,18 @@
 
 JNIEXPORT void JNICALL
 Java_GetLocalVars_testLocals(JNIEnv *env, jclass cls, jobject thread) {
+  /*
+   * We test the JVMTI GetLocal<Type> for locals of the method:
+   *
+   *  int staticMeth(byte byteArg, Object objArg, double dblArg, int intArg) {
+   *      testLocals(Thread.currentThread());
+   *      {
+   *          int intLoc = 9999;
+   *          intArg = intLoc;
+   *      }
+   *      return intArg;
+   *  }
+   */
   static const char* METHOD_NAME = "staticMeth";
   static const char* METHOD_SIGN = "(BLjava/lang/Object;DI)I";
   static const int Depth = 1;