diff --git a/mod/wiki/renderer.php b/mod/wiki/renderer.php
index 42d6c5179dd..3f40fe7745d 100644
--- a/mod/wiki/renderer.php
+++ b/mod/wiki/renderer.php
@@ -235,8 +235,19 @@ class mod_wiki_renderer extends plugin_renderer_base {
         return $output;
     }
     public function wiki_info() {
-        return $this->output->box(format_module_intro('wiki',
+        global $USER;
+
+        // Display any activity information (eg completion requirements / dates).
+        $cminfo = cm_info::create($this->page->cm);
+        $completiondetails = \core_completion\cm_completion_details::get_instance($cminfo, $USER->id);
+        $activitydates = \core\activity_dates::get_dates_for_module($cminfo, $USER->id);
+        $info = $this->output->activity_information($cminfo, $completiondetails, $activitydates);
+
+        // Add the rest of the wiki info.
+        $info .= $this->output->box(format_module_intro('wiki',
                 $this->page->activityrecord, $this->page->cm->id), 'generalbox', 'intro');
+
+        return $info;
     }
 
     public function tabs($page, $tabitems, $options) {
diff --git a/mod/wiki/tests/behat/wiki_activity_completion.feature b/mod/wiki/tests/behat/wiki_activity_completion.feature
new file mode 100644
index 00000000000..43176b05e6c
--- /dev/null
+++ b/mod/wiki/tests/behat/wiki_activity_completion.feature
@@ -0,0 +1,64 @@
+@mod @mod_url @core_completion
+Feature: View activity completion information in the Wiki activity
+  In order to have visibility of URL completion requirements
+  As a student
+  I need to be able to view my URL completion progress
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | student1 | Vinnie    | Student1 | student1@example.com |
+      | teacher1 | Darrell   | Teacher1 | teacher1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user | course | role           |
+      | student1 | C1 | student        |
+      | teacher1 | C1 | editingteacher |
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I navigate to "Edit settings" in current page administration
+    And I expand all fieldsets
+    And I set the following fields to these values:
+      | Enable completion tracking | Yes |
+      | Show completion conditions | Yes |
+    And I press "Save and display"
+
+  Scenario: View automatic completion items
+    Given I am on "Course 1" course homepage with editing mode on
+    And I add a "Wiki" to section "1" and I fill the form with:
+      | Wiki name           | Music history                                     |
+      | First page name     | Respect                                           |
+      | Completion tracking | Show activity as complete when conditions are met |
+      | Require view        | 1                                                 |
+    # Teacher view.
+    And I follow "Music history"
+    And I click on "Create page" "button"
+    And "Music history" should have the "View" completion condition
+    And I log out
+    # Student view.
+    When I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Music history"
+    And the "View" completion condition of "Music history" is displayed as "done"
+
+  @javascript
+  Scenario: Use manual completion
+    Given I am on "Course 1" course homepage with editing mode on
+    And I add a "Wiki" to section "1" and I fill the form with:
+      | Wiki name           | Music history                                        |
+      | First page name     | Respect                                              |
+      | Completion tracking | Students can manually mark the activity as completed |
+    # Teacher view.
+    And I follow "Music history"
+    And I click on "Create page" "button"
+    And the manual completion button for "Music history" should be disabled
+    And I log out
+    # Student view.
+    When I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Music history"
+    Then the manual completion button of "Music history" is displayed as "Mark as done"
+    And I toggle the manual completion state of "Music history"
+    And the manual completion button of "Music history" is displayed as "Done"