diff --git a/testhal/STM32/STM32F4xx/I2C-LIS3MLD/.project b/testhal/STM32/STM32F4xx/I2C-LIS3MLD/.project
index ce91587de..f38a9c01d 100644
--- a/testhal/STM32/STM32F4xx/I2C-LIS3MLD/.project
+++ b/testhal/STM32/STM32F4xx/I2C-LIS3MLD/.project
@@ -27,7 +27,7 @@
 		<link>
 			<name>board</name>
 			<type>2</type>
-			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F401C_DISCOVERY</locationURI>
+			<locationURI>CHIBIOS/os/hal/boards/ST_NUCLEO64_F401RE</locationURI>
 		</link>
 		<link>
 			<name>os</name>
diff --git a/testhal/STM32/STM32F4xx/I2C-LIS3MLD/debug/STM32F4xx-I2C-LIS3MDL (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F4xx/I2C-LIS3MLD/debug/STM32F4xx-I2C-LIS3MDL (OpenOCD, Flash and Run).launch
index a6e300385..48d2c9465 100644
--- a/testhal/STM32/STM32F4xx/I2C-LIS3MLD/debug/STM32F4xx-I2C-LIS3MDL (OpenOCD, Flash and Run).launch	
+++ b/testhal/STM32/STM32F4xx/I2C-LIS3MLD/debug/STM32F4xx-I2C-LIS3MDL (OpenOCD, Flash and Run).launch	
@@ -33,7 +33,7 @@
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;null-read_raw-(format)&quot; val=&quot;1&quot;/&gt;&lt;/contentList&gt;"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;sr-i2c_lld_serve_error_interrupt-(format)&quot; val=&quot;2&quot;/&gt;&lt;content id=&quot;null-read_raw-(format)&quot; val=&quot;1&quot;/&gt;&lt;content id=&quot;SR2-i2c-null-main-(format)&quot; val=&quot;2&quot;/&gt;&lt;content id=&quot;i2c-null-main-(format)&quot; val=&quot;0&quot;/&gt;&lt;/contentList&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList/&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
diff --git a/testhal/STM32/STM32F4xx/I2C-LIS3MLD/main.c b/testhal/STM32/STM32F4xx/I2C-LIS3MLD/main.c
index 25e304407..a1c148c88 100644
--- a/testhal/STM32/STM32F4xx/I2C-LIS3MLD/main.c
+++ b/testhal/STM32/STM32F4xx/I2C-LIS3MLD/main.c
@@ -180,8 +180,10 @@ int main(void) {
   halInit();
   chSysInit();
 
-  palSetLineMode(LINE_ARD_D14, PAL_MODE_ALTERNATE(4));
-  palSetLineMode(LINE_ARD_D15, PAL_MODE_ALTERNATE(4));
+  palSetLineMode(LINE_ARD_D15, PAL_MODE_ALTERNATE(4) |
+                 PAL_STM32_OSPEED_HIGHEST);
+  palSetLineMode(LINE_ARD_D14, PAL_MODE_ALTERNATE(4) |
+                 PAL_STM32_OSPEED_HIGHEST);
 
   /*
    * Activates the serial driver 2 using the driver default configuration.
diff --git a/testhal/STM32/STM32F4xx/I2C-LSM6DS0/.project b/testhal/STM32/STM32F4xx/I2C-LSM6DS0/.project
index 3c6fa14b7..9479b6d5d 100644
--- a/testhal/STM32/STM32F4xx/I2C-LSM6DS0/.project
+++ b/testhal/STM32/STM32F4xx/I2C-LSM6DS0/.project
@@ -27,7 +27,7 @@
 		<link>
 			<name>board</name>
 			<type>2</type>
-			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F401C_DISCOVERY</locationURI>
+			<locationURI>CHIBIOS/os/hal/boards/ST_NUCLEO64_F401RE</locationURI>
 		</link>
 		<link>
 			<name>os</name>
diff --git a/testhal/STM32/STM32F4xx/I2C-LSM6DS0/main.c b/testhal/STM32/STM32F4xx/I2C-LSM6DS0/main.c
index 196e2d8d7..5cbdd16c1 100644
--- a/testhal/STM32/STM32F4xx/I2C-LSM6DS0/main.c
+++ b/testhal/STM32/STM32F4xx/I2C-LSM6DS0/main.c
@@ -299,8 +299,10 @@ int main(void) {
   halInit();
   chSysInit();
 
-  palSetLineMode(LINE_ARD_D14, PAL_MODE_ALTERNATE(4));
-  palSetLineMode(LINE_ARD_D15, PAL_MODE_ALTERNATE(4));
+  palSetLineMode(LINE_ARD_D15, PAL_MODE_ALTERNATE(4) |
+                 PAL_STM32_OSPEED_HIGHEST);
+  palSetLineMode(LINE_ARD_D14, PAL_MODE_ALTERNATE(4) |
+                 PAL_STM32_OSPEED_HIGHEST);
 
   /*
    * Activates the serial driver 2 using the driver default configuration.
diff --git a/testhal/STM32/STM32L4xx/I2C-LIS3MLD/main.c b/testhal/STM32/STM32L4xx/I2C-LIS3MLD/main.c
index 4b21c6e36..8998292ed 100644
--- a/testhal/STM32/STM32L4xx/I2C-LIS3MLD/main.c
+++ b/testhal/STM32/STM32L4xx/I2C-LIS3MLD/main.c
@@ -182,8 +182,10 @@ int main(void) {
   halInit();
   chSysInit();
 
-  palSetLineMode(LINE_ARD_D14, PAL_MODE_ALTERNATE(4) | PAL_STM32_OSPEED_HIGH);
-  palSetLineMode(LINE_ARD_D15, PAL_MODE_ALTERNATE(4) | PAL_STM32_OSPEED_HIGH);
+  palSetLineMode(LINE_ARD_D15, PAL_MODE_ALTERNATE(4) |
+                 PAL_STM32_OSPEED_HIGHEST);
+  palSetLineMode(LINE_ARD_D14, PAL_MODE_ALTERNATE(4) |
+                 PAL_STM32_OSPEED_HIGHEST);
 
   /*
    * Activates the serial driver 2 using the driver default configuration.
diff --git a/testhal/STM32/STM32L4xx/I2C-LSM6DS0/main.c b/testhal/STM32/STM32L4xx/I2C-LSM6DS0/main.c
index fdf0199f4..c9469a1e2 100644
--- a/testhal/STM32/STM32L4xx/I2C-LSM6DS0/main.c
+++ b/testhal/STM32/STM32L4xx/I2C-LSM6DS0/main.c
@@ -301,8 +301,10 @@ int main(void) {
   halInit();
   chSysInit();
 
-  palSetLineMode(LINE_ARD_D14, PAL_MODE_ALTERNATE(4) | PAL_STM32_OSPEED_HIGH);
-  palSetLineMode(LINE_ARD_D15, PAL_MODE_ALTERNATE(4) | PAL_STM32_OSPEED_HIGH);
+  palSetLineMode(LINE_ARD_D15, PAL_MODE_ALTERNATE(4) |
+                 PAL_STM32_OSPEED_HIGHEST);
+  palSetLineMode(LINE_ARD_D14, PAL_MODE_ALTERNATE(4) |
+                 PAL_STM32_OSPEED_HIGHEST);
 
   /*
    * Activates the serial driver 2 using the driver default configuration.