diff --git a/ftplugin/vimwiki/taskwiki.vim b/ftplugin/vimwiki/taskwiki.vim
index 0f50331..bd3586d 100644
--- a/ftplugin/vimwiki/taskwiki.vim
+++ b/ftplugin/vimwiki/taskwiki.vim
@@ -26,7 +26,7 @@ let s:plugin_path = escape(expand('<sfile>:p:h:h:h'), '\')
 
 " Run the measure parts first, if desired
 if exists("g:taskwiki_measure_coverage")
-  execute 'py3file ' . s:plugin_path . '/knowledge/testcoverage.py'
+  execute 'py3file ' . s:plugin_path . '/taskwiki/testcoverage.py'
 endif
 
 " Execute the main body of taskwiki source
diff --git a/tests/base.py b/tests/base.py
index a232cef..1894124 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -22,10 +22,10 @@ class IntegrationTest(object):
     tasks = []
     markup = 'default'
 
-    def add_plugin(self, name):
+    def add_plugin(self, name, *args):
         plugin_base = os.path.expanduser('~/.vim/bundle/')
         plugin_path = os.path.join(plugin_base, name)
-        self.client.add_plugin(plugin_path)
+        self.client.add_plugin(plugin_path, *args)
 
     def write_buffer(self, lines, position=0):
         result = self.client.write_buffer(position + 1, lines)
@@ -92,10 +92,10 @@ class IntegrationTest(object):
 
         self.configure_global_variables()
         self.add_plugin('taskwiki')
-        self.add_plugin('vimwiki')
+        self.add_plugin('vimwiki', 'plugin/vimwiki.vim')
         self.filepath = os.path.join(self.dir, 'testwiki.txt')
         self.client.edit(self.filepath)
-        self.command('set filetype=vimwiki', silent=None)  # TODO: fix these vimwiki loading errors
+        self.command('set filetype=vimwiki')
 
     def teardown(self):
         if not self.client:
diff --git a/tests/test_selected.py b/tests/test_selected.py
index 8c6d965..2bb4ca1 100644
--- a/tests/test_selected.py
+++ b/tests/test_selected.py
@@ -1370,7 +1370,7 @@ class TestSelectAfterBufferSwitch(IntegrationTest):
         sleep(0.5)
         self.command('split testwiki2.txt', silent=False)
         sleep(0.5)
-        self.command('set filetype=vimwiki', silent=False)
+        self.command('set filetype=vimwiki')
         sleep(0.5)
         self.command('q!')
         sleep(0.5)