diff --git a/templates/bluepill/test b/templates/bluepill/test
index 0da7e1f..18b5dc5 100755
--- a/templates/bluepill/test
+++ b/templates/bluepill/test
@@ -49,6 +49,11 @@ class BluePill(DeviceUnderTestAeadUARTP):
 
         self.ocd = OpenOcd(self.openocd_cfg_path)
 
+        self.ser = serial.Serial(
+            self.uart_device,
+            baudrate=115200,
+            timeout=5)
+
     def firmware_size(self):
         return os.stat(self.firmware_bin_path).st_size
 
diff --git a/templates/f7/Makefile b/templates/f7/Makefile
index c5819ec..bb539a7 100644
--- a/templates/f7/Makefile
+++ b/templates/f7/Makefile
@@ -159,7 +159,8 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET
 OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
 vpath %.c $(sort $(dir $(C_SOURCES)))
 # list of ASM program objects
-OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
+ASM_OBJS=$(ASM_SOURCES:.S=.o)
+OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_OBJS:.s=.o)))
 vpath %.s $(sort $(dir $(ASM_SOURCES)))
 
 $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR) 
@@ -168,6 +169,9 @@ $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
 $(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
 	$(AS) -c $(CFLAGS) $< -o $@
 
+$(BUILD_DIR)/%.o: %.S Makefile | $(BUILD_DIR)
+	$(AS) -c $(CFLAGS) $< -o $@
+
 $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile
 	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
 	$(SZ) $@