diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
index aa52233ab5973..16cb900b99522 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
@@ -2154,6 +2154,25 @@ public function testRenderNumberWithHtml5NumberType()
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
             '/input
     [@type="number"]
+    [@step="any"]
+    [@name="name"]
+    [@class="my&class form-control"]
+    [@value="1234.56"]
+'
+        );
+    }
+
+    public function testRenderNumberWithHtml5NumberTypeAndStepAttribute()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\NumberType', 1234.56, [
+            'html5' => true,
+            'attr' => ['step' => '0.1'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/input
+    [@type="number"]
+    [@step="0.1"]
     [@name="name"]
     [@class="my&class form-control"]
     [@value="1234.56"]
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
index 2f6ac6cc2a86c..f9c8b35c68506 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -47,6 +47,10 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     {
         if ($options['html5']) {
             $view->vars['type'] = 'number';
+
+            if (!isset($view->vars['attr']['step'])) {
+                $view->vars['attr']['step'] = 'any';
+            }
         }
     }
 
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
index 9fd5df245b157..aa55bc74314d8 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
@@ -1877,6 +1877,26 @@ public function testRenderNumberWithHtml5NumberType()
         $this->assertWidgetMatchesXpath($form->createView(), [],
             '/input
     [@type="number"]
+    [@step="any"]
+    [@name="name"]
+    [@value="1234.56"]
+'
+        );
+    }
+
+    public function testRenderNumberWithHtml5NumberTypeAndStepAttribute()
+    {
+        $this->requiresFeatureSet(403);
+
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\NumberType', 1234.56, [
+            'html5' => true,
+            'attr' => ['step' => '0.1'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+            '/input
+    [@type="number"]
+    [@step="0.1"]
     [@name="name"]
     [@value="1234.56"]
 '