diff --git a/libraries/tests/mbed/digitalin_digitalout/main.cpp b/libraries/tests/mbed/digitalin_digitalout/main.cpp
index 1c212de168..671624962b 100644
--- a/libraries/tests/mbed/digitalin_digitalout/main.cpp
+++ b/libraries/tests/mbed/digitalin_digitalout/main.cpp
@@ -27,6 +27,10 @@ DigitalIn in(D2);
 DigitalOut out(PC_7);
 DigitalIn in(PB_8);
 
+#elif defined(TARGET_NUCLEO_F031K6)
+DigitalOut out(A4);
+DigitalIn in(A5);
+
 #elif defined(TARGET_ARCH_MAX) || \
       defined(TARGET_DISCO_F407VG) || \
       defined(TARGET_DISCO_F429ZI)|| \
diff --git a/libraries/tests/mbed/digitalinout/main.cpp b/libraries/tests/mbed/digitalinout/main.cpp
index 2d10245c3a..324d91b11f 100644
--- a/libraries/tests/mbed/digitalinout/main.cpp
+++ b/libraries/tests/mbed/digitalinout/main.cpp
@@ -27,6 +27,10 @@ DigitalInOut d2(D7);
 DigitalInOut d1(PC_7);
 DigitalInOut d2(PB_8);
 
+#elif defined(TARGET_NUCLEO_F031K6)
+DigitalInOut d1(A4);
+DigitalInOut d2(A5);
+
 #elif defined(TARGET_ARCH_MAX) || \
       defined(TARGET_DISCO_F407VG) || \
       defined(TARGET_DISCO_F429ZI)|| \
diff --git a/libraries/tests/mbed/interruptin/main.cpp b/libraries/tests/mbed/interruptin/main.cpp
index af9d9d8512..daaae3a90f 100644
--- a/libraries/tests/mbed/interruptin/main.cpp
+++ b/libraries/tests/mbed/interruptin/main.cpp
@@ -52,6 +52,10 @@ void in_handler() {
 #define PIN_IN      PB_8
 #define PIN_OUT     PC_7
 
+#elif defined(TARGET_NUCLEO_F031K6)
+#define PIN_IN      A4
+#define PIN_OUT     A5
+
 #elif defined(TARGET_ARCH_MAX) || \
       defined(TARGET_DISCO_F407VG) || \
       defined(TARGET_DISCO_F429ZI)|| \
diff --git a/workspace_tools/export/gccarm.py b/workspace_tools/export/gccarm.py
index dd9e069b1b..090698d88f 100755
--- a/workspace_tools/export/gccarm.py
+++ b/workspace_tools/export/gccarm.py
@@ -68,6 +68,7 @@ class GccArm(Exporter):
         'ARCH_MAX',
         'DISCO_F429ZI',
         'NUCLEO_F030R8',
+        'NUCLEO_F031K6',
         'NUCLEO_F070RB',
         'NUCLEO_F072RB',
         'NUCLEO_F091RC',
diff --git a/workspace_tools/export/iar.py b/workspace_tools/export/iar.py
index 9d3d986f28..4612385c37 100755
--- a/workspace_tools/export/iar.py
+++ b/workspace_tools/export/iar.py
@@ -47,6 +47,7 @@ class IAREmbeddedWorkbench(Exporter):
         'K22F',
         'K64F',
         'NUCLEO_F030R8',
+        'NUCLEO_F031K6',
         'NUCLEO_F070RB',
         'NUCLEO_F072RB',
         'NUCLEO_F091RC',
diff --git a/workspace_tools/export/uvision4.py b/workspace_tools/export/uvision4.py
index 628217fe65..562c8e0659 100644
--- a/workspace_tools/export/uvision4.py
+++ b/workspace_tools/export/uvision4.py
@@ -41,6 +41,7 @@ class Uvision4(Exporter):
         'LPC4337',
         'LPC812',
         'NUCLEO_F030R8',
+        'NUCLEO_F031K6',
         'NUCLEO_F070RB',
         'NUCLEO_F072RB',
         'NUCLEO_F091RC',
@@ -89,6 +90,7 @@ class Uvision4(Exporter):
         'LPC11C24',
         'LPC812',
         'NUCLEO_F030R8',
+        'NUCLEO_F031K6',
         'NUCLEO_F070RB',
         'NUCLEO_F072RB',
         'NUCLEO_F091RC',
diff --git a/workspace_tools/export_test.py b/workspace_tools/export_test.py
index 16d118d46e..1607e5aec2 100755
--- a/workspace_tools/export_test.py
+++ b/workspace_tools/export_test.py
@@ -120,6 +120,7 @@ if __name__ == '__main__':
             ('uvision', 'HRM1017'),
 
             ('uvision', 'NUCLEO_F030R8'),
+            ('uvision', 'NUCLEO_F031K6'),
             ('uvision', 'NUCLEO_F070RB'),
             ('uvision', 'NUCLEO_F072RB'),
             ('uvision', 'NUCLEO_F091RC'),
@@ -177,6 +178,7 @@ if __name__ == '__main__':
             ('gcc_arm', 'DISCO_F334C8'),
             ('gcc_arm', 'DISCO_L053C8'),
             ('gcc_arm', 'DISCO_F746NG'),
+			('gcc_arm', 'NUCLEO_F031K6'),
             ('gcc_arm', 'NRF51822'),
             ('gcc_arm', 'HRM1017'),
             ('gcc_arm', 'NUCLEO_F401RE'),
@@ -214,6 +216,7 @@ if __name__ == '__main__':
             ('iar', 'LPC1347'),
 
             ('iar', 'NUCLEO_F030R8'),
+            ('iar', 'NUCLEO_F031K6'),
             ('iar', 'NUCLEO_F070RB'),
             ('iar', 'NUCLEO_F072RB'),
             ('iar', 'NUCLEO_F091RC'),
diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py
index 0f7c0a07da..8545bffdf1 100755
--- a/workspace_tools/targets.py
+++ b/workspace_tools/targets.py
@@ -562,6 +562,16 @@ class NUCLEO_F030R8(Target):
         self.supported_form_factors = ["ARDUINO", "MORPHO"]
         self.detect_code = ["0725"]
 
+class NUCLEO_F031K6(Target):
+    def __init__(self):
+        Target.__init__(self)
+        self.core = "Cortex-M0"
+        self.extra_labels = ['STM', 'STM32F0', 'STM32F031K6']
+        self.supported_toolchains = ["ARM", "uARM", "IAR", "GCC_ARM"]
+        self.default_toolchain = "uARM"
+        self.supported_form_factors = ["ARDUINO"]
+        self.detect_code = ["0791"]
+
 class NUCLEO_F070RB(Target):
     def __init__(self):
         Target.__init__(self)
@@ -1628,6 +1638,7 @@ TARGETS = [
 
     ### STMicro ###
     NUCLEO_F030R8(),
+    NUCLEO_F031K6(),
     NUCLEO_F070RB(),
     NUCLEO_F072RB(),
     NUCLEO_F091RC(),