9 files changed, 25 insertions, 20 deletions
diff --git a/docs/tutorials/wiki/src/tests/.coveragerc b/docs/tutorials/wiki/src/tests/.coveragerc
index a1d87d03d..5db0e79cf 100644
--- a/docs/tutorials/wiki/src/tests/.coveragerc
+++ b/docs/tutorials/wiki/src/tests/.coveragerc
@@ -1,3 +1,2 @@
 [run]
 source = tutorial
-omit = tutorial/test*
diff --git a/docs/tutorials/wiki/src/tests/MANIFEST.in b/docs/tutorials/wiki/src/tests/MANIFEST.in
index 05cc195d9..b4624fd1c 100644
--- a/docs/tutorials/wiki/src/tests/MANIFEST.in
+++ b/docs/tutorials/wiki/src/tests/MANIFEST.in
@@ -1,2 +1,5 @@
 include *.txt *.ini *.cfg *.rst
 recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
+recursive-include tests *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
diff --git a/docs/tutorials/wiki/src/tests/pytest.ini b/docs/tutorials/wiki/src/tests/pytest.ini
index a3489cdf8..42c3259f9 100644
--- a/docs/tutorials/wiki/src/tests/pytest.ini
+++ b/docs/tutorials/wiki/src/tests/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
-testpaths = tutorial
-python_files = test*.py
+addopts = --strict
+
+testpaths =
+    tutorial
+    tests
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index fa5948acb..f19d643e6 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -44,7 +44,7 @@ setup(
     author_email='',
     url='',
     keywords='web pyramid pylons',
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests']),
     include_package_data=True,
     zip_safe=False,
     extras_require={
diff --git a/docs/tutorials/wiki/src/tests/tests/__init__.py b/docs/tutorials/wiki/src/tests/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/docs/tutorials/wiki/src/tests/tests/__init__.py
diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tests/test_it.py
index ff1c07b7c..e45380e6f 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/tests/tests/test_it.py
@@ -5,7 +5,7 @@ from pyramid import testing
 class PageModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from .models import Page
+        from tutorial.models import Page
         return Page
 
     def _makeOne(self, data='some data'):
@@ -18,7 +18,7 @@ class PageModelTests(unittest.TestCase):
 class WikiModelTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from .models import Wiki
+        from tutorial.models import Wiki
         return Wiki
 
     def _makeOne(self):
@@ -32,7 +32,7 @@ class WikiModelTests(unittest.TestCase):
 class AppmakerTests(unittest.TestCase):
 
     def _callFUT(self, zodb_root):
-        from .models import appmaker
+        from tutorial.models import appmaker
         return appmaker(zodb_root)
 
     def test_it(self):
@@ -43,7 +43,7 @@ class AppmakerTests(unittest.TestCase):
 
 class ViewWikiTests(unittest.TestCase):
     def test_it(self):
-        from .views.default import view_wiki
+        from tutorial.views.default import view_wiki
         context = testing.DummyResource()
         request = testing.DummyRequest()
         response = view_wiki(context, request)
@@ -51,7 +51,7 @@ class ViewWikiTests(unittest.TestCase):
 
 class ViewPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from .views.default import view_page
+        from tutorial.views.default import view_page
         return view_page(context, request)
 
     def test_it(self):
@@ -77,7 +77,7 @@ class ViewPageTests(unittest.TestCase):
 
 class AddPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from .views.default import add_page
+        from tutorial.views.default import add_page
         return add_page(context, request)
 
     def test_it_notsubmitted(self):
@@ -103,7 +103,7 @@ class AddPageTests(unittest.TestCase):
 
 class EditPageTests(unittest.TestCase):
     def _callFUT(self, context, request):
-        from .views.default import edit_page
+        from tutorial.views.default import edit_page
         return edit_page(context, request)
 
     def test_it_notsubmitted(self):
@@ -124,7 +124,7 @@ class EditPageTests(unittest.TestCase):
 
 class SecurityTests(unittest.TestCase):
     def test_hashing(self):
-        from .security import hash_password, check_password
+        from tutorial.security import hash_password, check_password
         password = 'secretpassword'
         hashed_password = hash_password(password)
         self.assertTrue(check_password(hashed_password, password))
@@ -145,7 +145,7 @@ class FunctionalTests(unittest.TestCase):
     def setUp(self):
         import tempfile
         import os.path
-        from . import main
+        from tutorial import main
         self.tmpdir = tempfile.mkdtemp()
 
         dbpath = os.path.join( self.tmpdir, 'test.db')
diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/layout.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/layout.pt
index b606e8dad..06a3c8157 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/templates/layout.pt
+++ b/docs/tutorials/wiki/src/tests/tutorial/templates/layout.pt
@@ -1,5 +1,5 @@
 <!DOCTYPE html metal:define-macro="layout">
-<html lang="{{request.locale_name}}">
+<html lang="${request.locale_name}">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/docs/tutorials/wiki/src/tests/tutorial/views/default.py b/docs/tutorials/wiki/src/tests/tutorial/views/default.py
index 3a3b170e2..7ba99c65b 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/views/default.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/views/default.py
@@ -24,7 +24,7 @@ def view_wiki(context, request):
     return HTTPFound(location=request.resource_url(context, 'FrontPage'))
 
 
-@view_config(context='..models.Page', renderer='../templates/view.pt',
+@view_config(context='..models.Page', renderer='tutorial:templates/view.pt',
              permission='view')
 def view_page(context, request):
     wiki = context.__parent__
@@ -47,7 +47,7 @@ def view_page(context, request):
 
 
 @view_config(name='add_page', context='..models.Wiki',
-             renderer='../templates/edit.pt',
+             renderer='tutorial:templates/edit.pt',
              permission='edit')
 def add_page(context, request):
     pagename = request.subpath[0]
@@ -67,7 +67,7 @@ def add_page(context, request):
 
 
 @view_config(name='edit_page', context='..models.Page',
-             renderer='../templates/edit.pt',
+             renderer='tutorial:templates/edit.pt',
              permission='edit')
 def edit_page(context, request):
     if 'form.submitted' in request.params:
@@ -80,8 +80,8 @@ def edit_page(context, request):
 
 
 @view_config(context='..models.Wiki', name='login',
-             renderer='../templates/login.pt')
-@forbidden_view_config(renderer='../templates/login.pt')
+             renderer='tutorial:templates/login.pt')
+@forbidden_view_config(renderer='tutorial:templates/login.pt')
 def login(request):
     login_url = request.resource_url(request.context, 'login')
     referrer = request.url
diff --git a/docs/tutorials/wiki/src/tests/tutorial/views/notfound.py b/docs/tutorials/wiki/src/tests/tutorial/views/notfound.py
index d44b4d0e6..dd0b00488 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/views/notfound.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/views/notfound.py
@@ -3,7 +3,7 @@ from pyramid.view import notfound_view_config
 from ..models import Page
 
 
-@notfound_view_config(renderer='../templates/404.pt')
+@notfound_view_config(renderer='tutorial:templates/404.pt')
 def notfound_view(request):
     request.response.status = 404
     pagename = request.path