diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index 3636daf2ef..49ea44be36 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -418,7 +418,7 @@
 //////////////////////////////////////////////////////////////////////////////
 //  OPTICAL_FLOW
 #ifndef OPTFLOW                         // sets global enabled/disabled flag for optflow (as seen in CLI)
- # define OPTFLOW                       DISABLED
+ # define OPTFLOW                       ENABLED
 #endif
 #ifndef OPTFLOW_ORIENTATION
  # define OPTFLOW_ORIENTATION    AP_OPTICALFLOW_ADNS3080_PINS_FORWARD
diff --git a/ArduCopter/test.pde b/ArduCopter/test.pde
index d7673d4f91..137fcd6726 100644
--- a/ArduCopter/test.pde
+++ b/ArduCopter/test.pde
@@ -284,7 +284,7 @@ test_optflow(uint8_t argc, const Menu::arg *argv)
 
         while(1) {
             delay(200);
-            optflow.update(millis());
+            optflow.update();
             Log_Write_Optflow();
             cliSerial->printf_P(PSTR("x/dx: %d/%d\t y/dy %d/%d\t squal:%d\n"),
                             optflow.x,