diff --git a/docs b/docs
index 20686b5c..cc1cb4bf 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 20686b5c327fa3a51e6e1325f60e685e9b389c5c
+Subproject commit cc1cb4bf30c6433131bac0365f973e7d757180c7
diff --git a/examples b/examples
index 013361ae..0ac639a8 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit 013361aec6292cf61858f8bb466e094837fdf696
+Subproject commit 0ac639a82b84ad9fc9fe98794cfe5309decf3ad0
diff --git a/platformio/ide/tpls/clion/.idea/watcherTasks.xml.tpl b/platformio/ide/tpls/clion/.idea/watcherTasks.xml.tpl
new file mode 100644
index 00000000..b05b34a8
--- /dev/null
+++ b/platformio/ide/tpls/clion/.idea/watcherTasks.xml.tpl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectTasksOptions">
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="-f -c clion init --ide clion" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="NEVER" />
+      <option name="fileExtension" value="ini" />
+      <option name="immediateSync" value="false" />
+      <option name="name" value="Monitor platformio.ini" />
+      <option name="output" value="" />
+      <option name="outputFilters">
+        <array>
+          <FilterInfo>
+            <option name="description" value="" />
+            <option name="name" value="PIO Conf" />
+            <option name="regExp" value="$FILE_PATH$:^platofrmio" />
+          </FilterInfo>
+        </array>
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="{{platformio_path}}" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="$PROJECT_DIR$" />
+      <envs />
+    </TaskOptions>
+  </component>
+</project>
\ No newline at end of file
diff --git a/platformio/ide/tpls/clion/.idea/workspace.xml.tpl b/platformio/ide/tpls/clion/.idea/workspace.xml.tpl
index 59426c43..8cf4214f 100644
--- a/platformio/ide/tpls/clion/.idea/workspace.xml.tpl
+++ b/platformio/ide/tpls/clion/.idea/workspace.xml.tpl
@@ -7,6 +7,7 @@
       <config projectName="{{project_name}}" targetName="PLATFORMIO_BUILD" />
       <config projectName="{{project_name}}" targetName="PLATFORMIO_UPLOAD" />
       <config projectName="{{project_name}}" targetName="PLATFORMIO_CLEAN" />
+      <config projectName="{{project_name}}" targetName="PLATFORMIO_TEST" />
       <config projectName="{{project_name}}" targetName="PLATFORMIO_PROGRAM" />
       <config projectName="{{project_name}}" targetName="PLATFORMIO_UPLOADFS" />
       <config projectName="{{project_name}}" targetName="PLATFORMIO_UPDATE_ALL" />
@@ -174,6 +175,10 @@
       <envs />
       <method />
     </configuration>
+    <configuration default="false" name="PLATFORMIO_TEST" type="CMakeRunConfiguration" factoryName="Application" WORKING_DIR="" PASS_PARENT_ENVS="FALSE" PROJECT_NAME="{{project_name}}" TARGET_NAME="PLATFORMIO_TEST" CONFIG_NAME="Debug">
+      <envs />
+      <method />
+    </configuration>
     <configuration default="false" name="PLATFORMIO_UPLOAD" type="CMakeRunConfiguration" factoryName="Application" WORKING_DIR="" PASS_PARENT_ENVS="FALSE" PROJECT_NAME="{{project_name}}" TARGET_NAME="PLATFORMIO_UPLOAD" CONFIG_NAME="Debug">
       <envs />
       <method />
@@ -194,15 +199,16 @@
       <envs />
       <method />
     </configuration>
-    <list size="8">
+    <list size="9">
       <item index="0" class="java.lang.String" itemvalue="Application.Build All" />
       <item index="1" class="java.lang.String" itemvalue="Application.PLATFORMIO_BUILD" />
-      <item index="3" class="java.lang.String" itemvalue="Application.PLATFORMIO_UPLOAD" />
-      <item index="2" class="java.lang.String" itemvalue="Application.PLATFORMIO_CLEAN" />
+      <item index="2" class="java.lang.String" itemvalue="Application.PLATFORMIO_UPLOAD" />
+      <item index="3" class="java.lang.String" itemvalue="Application.PLATFORMIO_CLEAN" />
+      <item index="4" class="java.lang.String" itemvalue="Application.PLATFORMIO_TEST" />
       <item index="5" class="java.lang.String" itemvalue="Application.PLATFORMIO_PROGRAM" />
-      <item index="4" class="java.lang.String" itemvalue="Application.PLATFORMIO_UPLOADFS" />
-      <item index="6" class="java.lang.String" itemvalue="Application.PLATFORMIO_UPDATE" />
-      <item index="7" class="java.lang.String" itemvalue="Application.PLATFORMIO_REBUILD_PROJECT_INDEX" />
+      <item index="6" class="java.lang.String" itemvalue="Application.PLATFORMIO_UPLOADFS" />
+      <item index="7" class="java.lang.String" itemvalue="Application.PLATFORMIO_UPDATE" />
+      <item index="8" class="java.lang.String" itemvalue="Application.PLATFORMIO_REBUILD_PROJECT_INDEX" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
diff --git a/platformio/ide/tpls/clion/CMakeLists.txt.tpl b/platformio/ide/tpls/clion/CMakeLists.txt.tpl
index a31664d0..63274c43 100644
--- a/platformio/ide/tpls/clion/CMakeLists.txt.tpl
+++ b/platformio/ide/tpls/clion/CMakeLists.txt.tpl
@@ -21,6 +21,12 @@ add_custom_target(
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+add_custom_target(
+    PLATFORMIO_TEST ALL
+    COMMAND ${PLATFORMIO_CMD} -f -c clion test
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 add_custom_target(
     PLATFORMIO_PROGRAM ALL
     COMMAND ${PLATFORMIO_CMD} -f -c clion run --target program
diff --git a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
index 85fef8f8..658536dd 100644
--- a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
+++ b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
@@ -22,4 +22,4 @@ include_directories("{{include.replace("\\", "/")}}")
 % end
 % end
 
-FILE(GLOB_RECURSE SRC_LIST {{project_src_dir.replace("\\", "/")}}/*.*)
+FILE(GLOB_RECURSE SRC_LIST "{{project_src_dir.replace("\\", "/")}}/*.*")