diff --git a/src/main/config/config_unittest.h b/src/main/config/config_unittest.h
index d6b5ed6b7b..f201808393 100644
--- a/src/main/config/config_unittest.h
+++ b/src/main/config/config_unittest.h
@@ -20,9 +20,6 @@
 #ifdef SRC_MAIN_SCHEDULER_C_
 #ifdef UNIT_TEST
 
-#ifdef SRC_MAIN_SCHEDULER_C_
-#ifdef UNIT_TEST
-
 cfTask_t *unittest_scheduler_selectedTask;
 uint8_t unittest_scheduler_selectedTaskDynamicPriority;
 uint16_t unittest_scheduler_waitingTasks;
diff --git a/src/main/scheduler.c b/src/main/scheduler.c
index d193404a5f..df1ad4a7b3 100755
--- a/src/main/scheduler.c
+++ b/src/main/scheduler.c
@@ -61,7 +61,7 @@ static cfTask_t* taskQueueArray[TASK_COUNT + 1]; // extra item for NULL pointer
 #endif
 STATIC_UNIT_TESTED void queueClear(void)
 {
-    memset(taskQueueArray, 0, (int)(sizeof(taskQueueArray)));
+    memset(taskQueueArray, 0, sizeof(cfTask_t) * (TASK_COUNT + 1));
     taskQueuePos = 0;
     taskQueueSize = 0;
 }
diff --git a/src/test/unit/scheduler_unittest.cc b/src/test/unit/scheduler_unittest.cc
index a21b506ccc..409336e34b 100644
--- a/src/test/unit/scheduler_unittest.cc
+++ b/src/test/unit/scheduler_unittest.cc
@@ -83,17 +83,6 @@ extern "C" {
     extern cfTask_t *queueNext(void);
 }
 
-TEST(SchedulerUnittest, TestPriorites)
-    {
-        // check that the #defines used by scheduler.c and scheduler_unittest.cc are in sync
-        EXPECT_EQ(14, TASK_COUNT);
-        EXPECT_EQ(TASK_PRIORITY_HIGH, cfTasks[TASK_SYSTEM].staticPriority);
-        EXPECT_EQ(TASK_PRIORITY_REALTIME, cfTasks[TASK_GYROPID].staticPriority);
-        EXPECT_EQ(TASK_PRIORITY_MEDIUM, cfTasks[TASK_ACCEL].staticPriority);
-        EXPECT_EQ(TASK_PRIORITY_LOW, cfTasks[TASK_SERIAL].staticPriority);
-        EXPECT_EQ(TASK_PRIORITY_MEDIUM, cfTasks[TASK_BATTERY].staticPriority);
-}
-
 TEST(SchedulerUnittest, TestPriorites)
 {
     EXPECT_EQ(14, TASK_COUNT);