diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
index dd6d13e..0bd1721 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
@@ -340,7 +340,7 @@ function testNodeDisplay() {
         $output = '1';
       }
 
-      $elements = $this->xpath('//div[text()="' . $output . '"]');
+      $elements = $this->xpath('//div[text()=:output]', array(':output' => $output));
       $this->assertEqual(count($elements), 1, 'Correct options found.');
     }
   }
diff --git a/core/modules/system/templates/field.html.twig b/core/modules/system/templates/field.html.twig
index a0d527a..ecf4406 100644
--- a/core/modules/system/templates/field.html.twig
+++ b/core/modules/system/templates/field.html.twig
@@ -29,13 +29,26 @@
  * @ingroup themeable
  */
 #}
-<div{{ attributes }}>
-  {% if not label_hidden %}
-    <div class="field-label"{{ title_attributes }}>{{ label }}:&nbsp;</div>
-  {% endif %}
-  <div class="field-items"{{ content_attributes }}>
-    {% for delta, item in items %}
-      <div class="field-item"{{ item_attributes[delta] }}>{{ item }}</div>
-    {% endfor %}
+{% if items.length > 1 %}
+  <div class="{{ attributes.class }}"{{ attributes }}>
+    {% if not label_hidden %}
+      <div class="field-label"{{ title_attributes }}>{{ label }}</div>
+    {% endif %}
+    <ul class="field-items"{{ content_attributes }}>
+      {% for delta, item in items %}
+        <li class="field-item"{{ item_attributes[delta] }}>{{ item }}</li>
+      {% endfor %}
+    </ul>
   </div>
-</div>
+{% else %}
+  {% for delta, item in items %}
+    {% if not label_hidden %}
+      <div class="field-item {{ attributes.class }}"{{ attributes }}>
+        <div class="field-label"{{ title_attributes }}>{{ label }}</div>
+        <div{{ content_attributes }}{{ item_attributes[delta] }}>{{ item }}</div>
+      </div>
+    {% else %}
+      <div class="field-item {{ attributes.class }}"{{ attributes }}{{ content_attributes }}{{ item_attributes[delta] }}>{{ item }}</div>
+    {% endif %}
+  {% endfor %}
+{% endif %}