diff --git a/src/cfclient/ui/tabs/ConsoleTab.py b/src/cfclient/ui/tabs/ConsoleTab.py
index 88a6061ec2..bce1447a52 100644
--- a/src/cfclient/ui/tabs/ConsoleTab.py
+++ b/src/cfclient/ui/tabs/ConsoleTab.py
@@ -77,6 +77,9 @@ def __init__(self, tabWidget, helper, *args):
         self._dumpSystemLoadButton.clicked.connect(
             lambda enabled:
             self._helper.cf.param.set_value("system.taskDump", '1'))
+        self._propellerTestButton.clicked.connect(
+            lambda enabled:
+            self._helper.cf.param.set_value("health.startPropTest", '1'))
 
     def printText(self, text):
         # Make sure we get printouts from the Crazyflie into the log (such as
@@ -90,7 +93,9 @@ def clear(self):
     def _connected(self, link_uri):
         """Callback when the Crazyflie has been connected"""
         self._dumpSystemLoadButton.setEnabled(True)
+        self._propellerTestButton.setEnabled(True)
 
     def _disconnected(self, link_uri):
         """Callback for when the Crazyflie has been disconnected"""
         self._dumpSystemLoadButton.setEnabled(False)
+        self._propellerTestButton.setEnabled(False)
diff --git a/src/cfclient/ui/tabs/consoleTab.ui b/src/cfclient/ui/tabs/consoleTab.ui
index 6011683bae..7988c432e4 100644
--- a/src/cfclient/ui/tabs/consoleTab.ui
+++ b/src/cfclient/ui/tabs/consoleTab.ui
@@ -41,6 +41,19 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="_propellerTestButton">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Experimental feature:&lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;&gt; Tests propellers and motors&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Place the Crazyflie on a flat hard surface and run the propeller test.&lt;/p&gt;&lt;p&gt;The crazyflie will run the motors in sequence and beeps the motors that are above the vibration threshold.&lt;/p&gt;&lt;p&gt;The results are also printed on the console.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Propeller test</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">