diff --git a/HISTORY.rst b/HISTORY.rst
index 1dbefa64..ce5c8d24 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,7 +7,11 @@ PlatformIO 3.0
 3.5.1 (2018-??-??)
 ~~~~~~~~~~~~~~~~~~
 
-* Custom firmware/program name in build directory (`example <http://docs.platformio.org/page/projectconf/advanced_scripting.html#custom-firmware-program-name>`__)
+* New ``test_speed`` option to control a communication baudrate/speed between
+  `PIO Unit Testing <http://docs.platformio.org/page/plus/unit-testing.html>`__
+  engine and a target device
+  (`issue #1273 <https://github.com/platformio/platformio-core/issues/1273>`_)
+* Configure a custom firmware/program name in build directory (`example <http://docs.platformio.org/page/projectconf/advanced_scripting.html#custom-firmware-program-name>`__)
 * Renamed ``envs_dir`` option to ``build_dir``
   in `Project Configuration File "platformio.ini" <http://docs.platformio.org/page/projectconf/section_platformio.html#build-dir>`__
 * Fixed project generator for CLion IDE
diff --git a/docs b/docs
index ab95233b..cbe24d46 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit ab95233b39db244a6c78be6bfe926f2502aa5aa0
+Subproject commit cbe24d46b20f78e513568a7955424c9cf387aab6
diff --git a/platformio/commands/run.py b/platformio/commands/run.py
index 7c045ade..beba742e 100644
--- a/platformio/commands/run.py
+++ b/platformio/commands/run.py
@@ -133,17 +133,19 @@ class EnvironmentProcessor(object):
                      "upload_resetmethod", "lib_deps", "lib_ignore",
                      "lib_extra_dirs", "lib_ldf_mode", "lib_compat_mode",
                      "lib_archive", "piotest", "test_transport", "test_filter",
-                     "test_ignore", "test_port", "debug_tool", "debug_port",
-                     "debug_init_cmds", "debug_extra_cmds", "debug_server",
-                     "debug_init_break", "debug_load_cmd", "monitor_port",
-                     "monitor_baud", "monitor_rts", "monitor_dtr")
+                     "test_ignore", "test_port", "test_speed", "debug_tool",
+                     "debug_port", "debug_init_cmds", "debug_extra_cmds",
+                     "debug_server", "debug_init_break", "debug_load_cmd",
+                     "monitor_port", "monitor_baud", "monitor_rts",
+                     "monitor_dtr")
 
     IGNORE_BUILD_OPTIONS = ("test_transport", "test_filter", "test_ignore",
-                            "test_port", "debug_tool", "debug_port",
-                            "debug_init_cmds", "debug_extra_cmds",
-                            "debug_server", "debug_init_break",
-                            "debug_load_cmd", "monitor_port", "monitor_baud",
-                            "monitor_rts", "monitor_dtr")
+                            "test_port", "test_speed", "debug_tool",
+                            "debug_port", "debug_init_cmds",
+                            "debug_extra_cmds", "debug_server",
+                            "debug_init_break", "debug_load_cmd",
+                            "monitor_port", "monitor_baud", "monitor_rts",
+                            "monitor_dtr")
 
     REMAPED_OPTIONS = {"framework": "pioframework", "platform": "pioplatform"}