diff --git a/completion/criteria/completion_criteria_activity.php b/completion/criteria/completion_criteria_activity.php
index a7b2d1f70f7..4fa66b536b6 100644
--- a/completion/criteria/completion_criteria_activity.php
+++ b/completion/criteria/completion_criteria_activity.php
@@ -147,7 +147,7 @@ class completion_criteria_activity extends completion_criteria {
         $data = $info->get_data($cm, false, $completion->userid);
 
         // If the activity is complete
-        if (in_array($data->completionstate, array(COMPLETION_COMPLETE, COMPLETION_COMPLETE_PASS))) {
+        if (in_array($data->completionstate, array(COMPLETION_COMPLETE, COMPLETION_COMPLETE_PASS, COMPLETION_COMPLETE_FAIL))) {
             if ($mark) {
                 $completion->mark_complete();
             }
@@ -229,6 +229,7 @@ class completion_criteria_activity extends completion_criteria {
             AND (
                 mc.completionstate = '.COMPLETION_COMPLETE.'
              OR mc.completionstate = '.COMPLETION_COMPLETE_PASS.'
+             OR mc.completionstate = '.COMPLETION_COMPLETE_FAIL.'
                 )
         ';
 
diff --git a/completion/upgrade.txt b/completion/upgrade.txt
new file mode 100644
index 00000000000..8ade6e135da
--- /dev/null
+++ b/completion/upgrade.txt
@@ -0,0 +1,7 @@
+This files describes API changes in /completion/* - completion,
+information provided here is intended especially for developers.
+
+=== 2.9 ===
+
+* A completed and failed activity counts as a completed activity for
+  course completion.