diff --git a/html/semantics/forms/the-optgroup-element/optgroup-removal.window.js b/html/semantics/forms/the-optgroup-element/optgroup-removal.window.js
index 4e4c2df77e317c..ea23e8d724ae49 100644
--- a/html/semantics/forms/the-optgroup-element/optgroup-removal.window.js
+++ b/html/semantics/forms/the-optgroup-element/optgroup-removal.window.js
@@ -1,6 +1,6 @@
 test(() => {
   const select = document.createElement("select");
-  select.innerHTML = "<optgroup><option>1<optgroup><option>2";
+  select.innerHTML = "<optgroup><option>1</optgroup><optgroup><option>2";
   assert_equals(select.value, "1");
   select.querySelector("optgroup").remove();
   assert_equals(select.value, "2");
diff --git a/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html b/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html
index 92eabdc5d8d341..1a6274662a2c24 100644
--- a/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html
+++ b/html/semantics/forms/the-select-element/stylable-select/select-datalist-options-idl.tentative.html
@@ -5,65 +5,80 @@
 <script src="/resources/testharnessreport.js"></script>
 
 <select>
-  <datalist>
-    <option class=one>one</option>
-    <div>
-      <option class=two>two</option>
+  <option class=one>one</option>
+  <datalist id=datalist1>
+    <option class=two>two</option>
+    <div id=div1>
+      <option class=three>three</option>
     </div>
-    <option class=three>three</option>
+    <option class=four>four</option>
   </datalist>
   <datalist>
-    <option>ignored since not in first datalist</option>
+    <option class=five>five</option>
   </datalist>
+  <div id=div2>
+    <option class=six>six</option>
+  </div>
 </select>
 
 <script>
 const select = document.querySelector('select');
 
 function runTest() {
-  const datalist = select.querySelector('datalist');
+  const datalist = document.getElementById('datalist1');
   const firstOption = select.querySelector('option.one');
   const secondOption = select.querySelector('option.two');
   const thirdOption = select.querySelector('option.three');
-  const datalistChildDiv = datalist.querySelector('div');
-
-  let selectChildDiv = document.querySelector('select > div');
-  if (!selectChildDiv) {
-    selectChildDiv = document.createElement('div');
-    select.appendChild(selectChildDiv);
-  }
+  const fourthOption = select.querySelector('option.four');
+  const fifthOption = select.querySelector('option.five');
+  const sixthOption = select.querySelector('option.six');
+  const datalistChildDiv = document.getElementById('div1');
+  const selectChildDiv = document.getElementById('div2');
 
-  assert_equals(select.length, 3, 'select.length');
-  assert_equals(select.options.length, 3, 'select.options.length');
+  assert_equals(select.length, 6, 'select.length');
+  assert_equals(select.options.length, 6, 'select.options.length');
   assert_equals(select.options[0], firstOption, 'select.options[0]');
   assert_equals(select.options[1], secondOption, 'select.options[1]');
   assert_equals(select.options[2], thirdOption, 'select.options[2]');
+  assert_equals(select.options[3], fourthOption, 'select.options[3]');
+  assert_equals(select.options[4], fifthOption, 'select.options[4]');
+  assert_equals(select.options[5], sixthOption, 'select.options[5]');
 
   assert_equals(select.value, 'one', 'initial select.value');
   select.value = 'two';
   assert_equals(select.value, 'two', 'select.value after modifying');
 
-  secondOption.remove();
-  assert_equals(select.length, 2, 'select.length after removing an option');
-  assert_equals(select.options.length, 2, 'select.options.length after removing an option');
+  fourthOption.remove();
+  assert_equals(select.length, 5, 'select.length after removing an option');
+  assert_equals(select.options.length, 5, 'select.options.length after removing an option');
   assert_equals(select.options[0], firstOption, 'select.options[0] after removing an option');
-  assert_equals(select.options[1], thirdOption, 'select.options[1] after removing an option');
+  assert_equals(select.options[1], secondOption, 'select.options[1] after removing an option');
+  assert_equals(select.options[2], thirdOption, 'select.options[0] after removing an option');
+  assert_equals(select.options[3], fifthOption, 'select.options[1] after removing an option');
+  assert_equals(select.options[4], sixthOption, 'select.options[1] after removing an option');
 
-  datalist.appendChild(secondOption);
-  assert_equals(select.length, 3, 'select.length after re-adding an option');
-  assert_equals(select.options.length, 3, 'select.options.length after re-adding an option');
+  datalist.appendChild(fourthOption);
+  assert_equals(select.length, 6, 'select.length after re-adding an option');
+  assert_equals(select.options.length, 6, 'select.options.length after re-adding an option');
   assert_equals(select.options[0], firstOption, 'select.options[0] after re-adding an option');
-  assert_equals(select.options[1], thirdOption, 'select.options[1] after re-adding an option');
-  assert_equals(select.options[2], secondOption, 'select.options[2] after re-adding an option');
+  assert_equals(select.options[1], secondOption, 'select.options[1] after re-adding an option');
+  assert_equals(select.options[2], thirdOption, 'select.options[2] after re-adding an option');
+  assert_equals(select.options[3], fourthOption, 'select.options[2] after re-adding an option');
+  assert_equals(select.options[4], fifthOption, 'select.options[2] after re-adding an option');
+  assert_equals(select.options[5], sixthOption, 'select.options[2] after re-adding an option');
 
-  selectChildDiv.appendChild(secondOption);
-  assert_equals(select.length, 2, 'select.length after moving option to child div');
-  assert_equals(select.options.length, 2, 'select.options.length after moving option to child div');
+  selectChildDiv.appendChild(fourthOption);
+  assert_equals(select.length, 6, 'select.length after moving option to child div');
+  assert_equals(select.options.length, 6, 'select.options.length after moving option to child div');
   assert_equals(select.options[0], firstOption, 'select.options[0] after moving option to child div');
-  assert_equals(select.options[1], thirdOption, 'select.options[1] after moving option to child div');
+  assert_equals(select.options[1], secondOption, 'select.options[1] after moving option to child div');
+  assert_equals(select.options[2], thirdOption, 'select.options[2] after moving option to child div');
+  assert_equals(select.options[3], fifthOption, 'select.options[3] after moving option to child div');
+  assert_equals(select.options[4], sixthOption, 'select.options[4] after moving option to child div');
+  assert_equals(select.options[5], fourthOption, 'select.options[5] after moving option to child div');
 
   // reset back to normal for the next test
-  datalistChildDiv.appendChild(secondOption);
+  datalist.appendChild(fourthOption);
   select.value = 'one';
 }
 
diff --git a/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html b/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html
index 31133446d4d140..5aa4638f0be819 100644
--- a/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html
+++ b/html/semantics/forms/the-select-element/stylable-select/select-parsing.tentative.html
@@ -37,12 +37,9 @@
 </select>
 
 <select id=s6>
-<button>
-<button></button>
-</button>
-<datalist>
-<datalist></datalist>
-</datalist>
+  <div>
+    <option><img>option</option>
+  </div>
 </select>
 
 <div id=afterlast>
@@ -55,15 +52,15 @@
   // previous test case didn't leave the HTML parser open on another element.
   assert_equals(document.getElementById('s1').parentNode, document.body);
   assert_equals(document.getElementById('s1').innerHTML, `
-  div 1
+  <div>div 1</div>
   <button>button</button>
-  div 2
+  <div>div 2</div>
   <datalist>
     <option>option</option>
   </datalist>
-  div 3
+  <div>div 3</div>
 `);
-}, '<button>s and <datalist>s should be allowed in <select>.');
+}, '<div>s, <button>s, and <datalist>s should be allowed in <select>.');
 
 test(() => {
   assert_equals(document.getElementById('s2').parentNode, document.body);
@@ -97,14 +94,11 @@
 test(() => {
   assert_equals(document.getElementById('s6').parentNode, document.body);
   assert_equals(document.getElementById('s6').innerHTML, `
-<button>
-</button>
-
-<datalist>
-</datalist>
-
+  <div>
+    <option><img>option</option>
+  </div>
 `);
-}, 'Nested <button>s or <datalist>s in <select> should be dropped.');
+}, 'Divs and imgs should be allowed as direct children of select and within options without a datalist.');
 
 test(() => {
   assert_equals(document.getElementById('afterlast').parentNode, document.body);