diff --git a/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp b/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp
index e1eb899b54..c7a8809758 100644
--- a/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp
+++ b/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp
@@ -13,7 +13,7 @@
 #define TIMX_IRQn               UAVCAN_STM32_GLUE3(TIM, UAVCAN_STM32_TIMER_NUMBER, _IRQn)
 #define TIMX_IRQHandler         UAVCAN_STM32_GLUE3(TIM, UAVCAN_STM32_TIMER_NUMBER, _IRQHandler)
 
-#if UAVCAN_STM32_TIMER_NUMBER >= 2 && UAVCAN_STM32_TIMER_NUMBER <= 5
+#if UAVCAN_STM32_TIMER_NUMBER >= 2 && UAVCAN_STM32_TIMER_NUMBER <= 7
 # define TIMX_RCC_ENR           RCC->APB1ENR
 # define TIMX_RCC_RSTR          RCC->APB1RSTR
 # define TIMX_RCC_ENR_MASK      UAVCAN_STM32_GLUE3(RCC_APB1ENR_TIM,  UAVCAN_STM32_TIMER_NUMBER, EN)
diff --git a/libuavcan_drivers/stm32/test_stm32f107/Makefile b/libuavcan_drivers/stm32/test_stm32f107/Makefile
index 0f1e369556..82be677b75 100644
--- a/libuavcan_drivers/stm32/test_stm32f107/Makefile
+++ b/libuavcan_drivers/stm32/test_stm32f107/Makefile
@@ -16,7 +16,7 @@ UDEFS = -DUAVCAN_STM32_CHIBIOS=1 -DUAVCAN_STM32_DEBUG=1
 # UAVCAN library
 #
 
-UDEFS += -DUAVCAN_STM32_TIMER_NUMBER=2
+UDEFS += -DUAVCAN_STM32_TIMER_NUMBER=7
 
 include ../../../libuavcan/include.mk
 CPPSRC += $(LIBUAVCAN_SRC)