diff --git a/test/parallel/test-whatwg-encoding-fatal-streaming.js b/test/parallel/test-whatwg-encoding-custom-fatal-streaming.js
similarity index 88%
rename from test/parallel/test-whatwg-encoding-fatal-streaming.js
rename to test/parallel/test-whatwg-encoding-custom-fatal-streaming.js
index ddedb483624..d1199874871 100644
--- a/test/parallel/test-whatwg-encoding-fatal-streaming.js
+++ b/test/parallel/test-whatwg-encoding-custom-fatal-streaming.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // From: https://github.com/w3c/web-platform-tests/blob/d74324b53c/encoding/textdecoder-fatal-streaming.html
+// With the twist that we specifically test for Node.js error codes
 
 const common = require('../common');
 
@@ -28,6 +29,7 @@ const assert = require('assert');
       }
     );
 
+    // TODO(joyeecheung): remove this when WPT is ported
     assert.strictEqual(
       new TextDecoder(testCase.encoding).decode(data),
       '\uFFFD'
@@ -40,6 +42,7 @@ const assert = require('assert');
   const odd = new Uint8Array([0x00]);
   const even = new Uint8Array([0x00, 0x00]);
 
+  // TODO(joyeecheung): remove this when WPT is ported
   assert.strictEqual(decoder.decode(odd, { stream: true }), '');
   assert.strictEqual(decoder.decode(odd), '\u0000');
 
@@ -67,6 +70,7 @@ const assert = require('assert');
     }
   );
 
+  // TODO(joyeecheung): remove this when WPT is ported
   assert.strictEqual(decoder.decode(even, { stream: true }), '\u0000');
   assert.strictEqual(decoder.decode(even), '\u0000');
 }
diff --git a/test/parallel/test-whatwg-encoding-internals.js b/test/parallel/test-whatwg-encoding-custom-internals.js
similarity index 98%
rename from test/parallel/test-whatwg-encoding-internals.js
rename to test/parallel/test-whatwg-encoding-custom-internals.js
index d025642365f..64bf6abe0d9 100644
--- a/test/parallel/test-whatwg-encoding-internals.js
+++ b/test/parallel/test-whatwg-encoding-custom-internals.js
@@ -1,6 +1,8 @@
 // Flags: --expose-internals
 'use strict';
 
+// This tests internal mapping of the Node.js encoding implementation
+
 require('../common');
 
 const assert = require('assert');
diff --git a/test/parallel/test-whatwg-encoding-textencoder.js b/test/parallel/test-whatwg-encoding-custom-interop.js
similarity index 93%
rename from test/parallel/test-whatwg-encoding-textencoder.js
rename to test/parallel/test-whatwg-encoding-custom-interop.js
index 9022477229c..0ea732a03d7 100644
--- a/test/parallel/test-whatwg-encoding-textencoder.js
+++ b/test/parallel/test-whatwg-encoding-custom-interop.js
@@ -1,4 +1,8 @@
 // Flags: --expose-internals
+
+// This tests interoperability between TextEncoder and TextDecoder with
+// Node.js util.inspect and Buffer APIs
+
 'use strict';
 
 const common = require('../common');