diff --git a/setup.cfg b/setup.cfg
index f552d9e..f9c4bd7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,8 +5,7 @@ ignore = E123,E221,E226,E302,E41,E701
 max-line-length = 160
 max-complexity = 10
 
-[nosetests]
-verbosity=3
-detailed-errors=1
-
+[pytest]
 
+[aliases]
+test=pytest
diff --git a/setup.py b/setup.py
index ad5193c..2f593f4 100644
--- a/setup.py
+++ b/setup.py
@@ -28,8 +28,13 @@ requirements = [
     # no external requirements
 ]
 
+setup_requirements = [
+    'pytest-runner',
+    ]
+
 test_requirements = [
-    'nose',
+    'pytest',
+    'bacpypes',
 ]
 
 setup(
@@ -61,6 +66,9 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
     ],
-    test_suite='nose.collector',
-    tests_require=test_requirements
+
+    setup_requires=setup_requirements,
+
+    test_suite='tests',
+    tests_require=test_requirements,
 )
diff --git a/tests/__init__.py b/tests/__init__.py
index de23c55..4f5fe70 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -7,11 +7,12 @@ BACpypes Testing
 """
 
 from . import utilities
+from . import state_machine
+from . import time_machine
 
-
-def setUpPackage():
-    utilities.setUpPackage()
-
-
-def tearDownPackage():
-    utilities.tearDownPackage()
+from . import test_comm
+# from . import test_objects
+from . import test_pdu
+from . import test_primitive_data
+from . import test_utilities
+from . import test_vlan
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000..f57ebb5
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+
+"""
+Glue routines to simulate package setup and teardown.
+"""
+
+from .utilities import setup_package, teardown_package
+
+def pytest_configure(config):
+    setup_package()
+
+
+def pytest_unconfigure():
+    teardown_package()
diff --git a/tests/state_machine.py b/tests/state_machine.py
index f065a7d..2014122 100755
--- a/tests/state_machine.py
+++ b/tests/state_machine.py
@@ -22,10 +22,6 @@ from bacpypes.task import FunctionTask as _FunctionTask
 _debug = 0
 _log = ModuleLogger(globals())
 
-#
-#   Transitions
-#
-
 
 class Transition:
 
@@ -65,11 +61,7 @@ class TimeoutTransition(Transition):
         self.timeout = timeout
 
 
-#
-#   State
-#
-
-
+@bacpypes_debugging
 class State:
 
     """
@@ -297,14 +289,8 @@ class State:
             hex(id(self)),
         )
 
-bacpypes_debugging(State)
-
-
-#
-#   StateMachine
-#
-
 
+@bacpypes_debugging
 class StateMachine:
 
     """
@@ -681,14 +667,8 @@ class StateMachine:
             hex(id(self)),
         )
 
-bacpypes_debugging(StateMachine)
-
-
-#
-#   StateMachineGroup
-#
-
 
+@bacpypes_debugging
 class StateMachineGroup:
 
     """
@@ -849,14 +829,8 @@ class StateMachineGroup:
         at least one of them is in a 'fail' final state."""
         if _debug: StateMachineGroup._debug("fail")
 
-bacpypes_debugging(StateMachineGroup)
-
-
-#
-#   ClientStateMachine
-#
-
 
+@bacpypes_debugging
 class ClientStateMachine(Client, StateMachine):
 
     """
@@ -882,14 +856,8 @@ class ClientStateMachine(Client, StateMachine):
         if _debug: ClientStateMachine._debug("confirmation %r", pdu)
         self.receive(pdu)
 
-bacpypes_debugging(ClientStateMachine)
-
-
-#
-#   ServerStateMachine
-#
-
 
+@bacpypes_debugging
 class ServerStateMachine(Server, StateMachine):
 
     """
@@ -914,5 +882,3 @@ class ServerStateMachine(Server, StateMachine):
     def indication(self, pdu):
         if _debug: ServerStateMachine._debug("indication %r", pdu)
         self.receive(pdu)
-
-bacpypes_debugging(ServerStateMachine)
diff --git a/tests/test_1.py b/tests/test_1.py
index 5e97b7f..63e681c 100644
--- a/tests/test_1.py
+++ b/tests/test_1.py
@@ -15,6 +15,7 @@ _debug = 0
 _log = ModuleLogger(globals())
 
 
+@bacpypes_debugging
 class TestSomething(unittest.TestCase):
 
     def setUp(self):
@@ -25,5 +26,3 @@ class TestSomething(unittest.TestCase):
 
     def tearDown(self):
         if _debug: TestSomething._debug("tearDown")
-
-bacpypes_debugging(TestSomething)
diff --git a/tests/test__template.py b/tests/test__template.py
index 1043122..c09a304 100644
--- a/tests/test__template.py
+++ b/tests/test__template.py
@@ -2,19 +2,8 @@
 # -*- coding: utf-8 -*-
 
 """
-Nose Test Module Template
--------------------------
-
-This module is a template for creating MongoTree test cases.  To create a
-module of new tests, make a copy of this template and rename the
-TestCaseTemplate and associated test_something functions.
-
-In following with the nose testing methodology, setUpModule() will be called
-before all of the tests in this module, setUpClass() will be called before
-all of the tests in the class, and setUp() will be called before each test.
-Similarly, tearDown() will be called after each test, tearDownClass() will be
-called after all of the tests in the class, and tearDownModule() will be
-called after all of the classes in the module.
+Test Module Template
+--------------------
 """
 
 import unittest
@@ -27,38 +16,45 @@ _debug = 0
 _log = ModuleLogger(globals())
 
 
-def setUpModule():
-    if _debug: setUpModule._debug("setUpModule")
-
-bacpypes_debugging(setUpModule)
+@bacpypes_debugging
+def setup_module():
+    if _debug: setup_module._debug("setup_module")
 
 
-def tearDownModule():
-    if _debug: tearDownModule._debug("tearDownModule")
-
-bacpypes_debugging(tearDownModule)
+@bacpypes_debugging
+def teardown_module():
+    if _debug: teardown_module._debug("teardown_module")
 
 
+@bacpypes_debugging
+def setup_function(function):
+    if _debug: setup_function._debug("setup_function %r", function)
+
+
+@bacpypes_debugging
+def teardown_function(function):
+    if _debug: teardown_function._debug("teardown_function %r", function)
+
+
+@bacpypes_debugging
 class TestCaseTemplate(unittest.TestCase):
 
     @classmethod
-    def setUpClass(cls):
-        if _debug: TestCaseTemplate._debug("setUpClass")
+    def setup_class(cls):
+        if _debug: TestCaseTemplate._debug("setup_class")
 
     @classmethod
-    def tearDownClass(cls):
-        if _debug: TestCaseTemplate._debug("tearDownClass")
+    def teardown_class(cls):
+        if _debug: TestCaseTemplate._debug("teardown_class")
 
-    def setUp(self):
-        if _debug: TestCaseTemplate._debug("setUp")
+    def setup_method(self, method):
+        if _debug: TestCaseTemplate._debug("setup_module %r", method)
+
+    def teardown_method(self, method):
+        if _debug: TestCaseTemplate._debug("teardown_method %r", method)
 
     def test_something(self):
         if _debug: TestCaseTemplate._debug("test_something")
 
     def test_something_else(self):
         if _debug: TestCaseTemplate._debug("test_something_else")
-
-    def tearDown(self):
-        if _debug: TestCaseTemplate._debug("tearDown")
-
-bacpypes_debugging(TestCaseTemplate)
diff --git a/tests/test_comm/__init__.py b/tests/test_comm/__init__.py
index 98105f6..51319c9 100644
--- a/tests/test_comm/__init__.py
+++ b/tests/test_comm/__init__.py
@@ -5,4 +5,9 @@ Test BACpypes Comm Module
 """
 
 from . import test_pci
+from . import test_pdudata
+from . import test_pdu
+
+from . import test_client
+from . import test_server
 
diff --git a/tests/test_comm/test_pci.py b/tests/test_comm/test_pci.py
index 4dcd1d1..bc34022 100644
--- a/tests/test_comm/test_pci.py
+++ b/tests/test_comm/test_pci.py
@@ -16,38 +16,11 @@ _debug = 0
 _log = ModuleLogger(globals())
 
 
-def setUpModule():
-    if _debug: setUpModule._debug("setUpModule")
-
-bacpypes_debugging(setUpModule)
-
-
-def tearDownModule():
-    if _debug: tearDownModule._debug("tearDownModule")
-
-bacpypes_debugging(tearDownModule)
-
-
+@bacpypes_debugging
 class TestPCI(unittest.TestCase):
 
-    @classmethod
-    def setUpClass(cls):
-        if _debug: TestPCI._debug("setUpClass")
-
-    @classmethod
-    def tearDownClass(cls):
-        if _debug: TestPCI._debug("tearDownClass")
-
-    def setUp(self):
-        if _debug: TestPCI._debug("setUp")
-
-    def tearDown(self):
-        if _debug: TestPCI._debug("tearDown")
-
     def test_something(self):
         if _debug: TestPCI._debug("test_something")
 
     def test_something_else(self):
-        if _debug: TestPCI._debug("test_something_else")
-
-bacpypes_debugging(TestPCI)
+        if _debug: TestPCI._debug("test_something_else")
\ No newline at end of file
diff --git a/tests/test_comm/test_pdu.py b/tests/test_comm/test_pdu.py
index a33c4e1..106204f 100644
--- a/tests/test_comm/test_pdu.py
+++ b/tests/test_comm/test_pdu.py
@@ -16,38 +16,11 @@ _debug = 0
 _log = ModuleLogger(globals())
 
 
-def setUpModule():
-    if _debug: setUpModule._debug("setUpModule")
-
-bacpypes_debugging(setUpModule)
-
-
-def tearDownModule():
-    if _debug: tearDownModule._debug("tearDownModule")
-
-bacpypes_debugging(tearDownModule)
-
-
+@bacpypes_debugging
 class TestPDU(unittest.TestCase):
 
-    @classmethod
-    def setUpClass(cls):
-        if _debug: TestPDU._debug("setUpClass")
-
-    @classmethod
-    def tearDownClass(cls):
-        if _debug: TestPDU._debug("tearDownClass")
-
-    def setUp(self):
-        if _debug: TestPDU._debug("setUp")
-
-    def tearDown(self):
-        if _debug: TestPDU._debug("tearDown")
-
     def test_something(self):
         if _debug: TestPDU._debug("test_something")
 
     def test_something_else(self):
         if _debug: TestPDU._debug("test_something_else")
-
-bacpypes_debugging(TestPDU)
diff --git a/tests/test_primitive_data/__init__.py b/tests/test_primitive_data/__init__.py
index c0c458a..4a3505d 100644
--- a/tests/test_primitive_data/__init__.py
+++ b/tests/test_primitive_data/__init__.py
@@ -4,4 +4,19 @@
 Test Primitive Data Module
 """
 
+from . import test_tag
+
+from . import test_bit_string
+from . import test_boolean
+from . import test_character_string
+from . import test_date
+from . import test_double
+from . import test_enumerated
 from . import test_integer
+from . import test_null
+from . import test_object_identifier
+from . import test_object_type
+from . import test_octet_string
+from . import test_real
+from . import test_time
+from . import test_unsigned
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_bit_string.py b/tests/test_primitive_data/test_bit_string.py
index fa849ae..95cbed1 100644
--- a/tests/test_primitive_data/test_bit_string.py
+++ b/tests/test_primitive_data/test_bit_string.py
@@ -27,7 +27,7 @@ class SampleBitString(BitString):
         'b7': 7,
         'b8': 8,
         'b12': 12,
-    }
+        }
 
 
 @bacpypes_debugging
@@ -41,6 +41,7 @@ def bit_string_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def bit_string_encode(obj):
     """Encode an BitString object into a tag."""
@@ -160,5 +161,4 @@ class TestBitString(unittest.TestCase):
         bit_string_endec([0] * 2, '0600')
         bit_string_endec([1] * 2, '06c0')
         bit_string_endec([0] * 10, '060000')
-        bit_string_endec([1] * 10, '06ffc0')
-
+        bit_string_endec([1] * 10, '06ffc0')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_boolean.py b/tests/test_primitive_data/test_boolean.py
index 0a2c988..c54c0c3 100644
--- a/tests/test_primitive_data/test_boolean.py
+++ b/tests/test_primitive_data/test_boolean.py
@@ -28,6 +28,7 @@ def boolean_tag(value):
 
     return tag
 
+
 @bacpypes_debugging
 def boolean_encode(obj):
     """Encode an Boolean object into a tag."""
@@ -122,4 +123,4 @@ class TestBoolean(unittest.TestCase):
         if _debug: TestBoolean._debug("test_boolean_endec")
 
         boolean_endec(False, False)
-        boolean_endec(True, True)
+        boolean_endec(True, True)
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_character_string.py b/tests/test_primitive_data/test_character_string.py
index d0fde47..15f66ec 100644
--- a/tests/test_primitive_data/test_character_string.py
+++ b/tests/test_primitive_data/test_character_string.py
@@ -32,6 +32,7 @@ def character_string_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def character_string_encode(obj):
     """Encode an CharacterString object into a tag."""
@@ -125,4 +126,4 @@ class TestCharacterString(unittest.TestCase):
             obj = CharacterString(character_string_tag(''))
 
         character_string_endec("", '00')
-        character_string_endec("abc", '00616263')
+        character_string_endec("abc", '00616263')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_date.py b/tests/test_primitive_data/test_date.py
index 6e3c975..95dc217 100644
--- a/tests/test_primitive_data/test_date.py
+++ b/tests/test_primitive_data/test_date.py
@@ -29,6 +29,7 @@ def date_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def date_encode(obj):
     """Encode an Date object into a tag."""
@@ -174,4 +175,4 @@ class TestDate(unittest.TestCase):
         def test_Wrong(self):
             with self.assertRaises(ValueError):        
                 for each in self.notEnoughPreciseOrWrong:
-                    new_date = Date(each[0])
+                    new_date = Date(each[0])
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_double.py b/tests/test_primitive_data/test_double.py
index 558ca73..b773c9e 100644
--- a/tests/test_primitive_data/test_double.py
+++ b/tests/test_primitive_data/test_double.py
@@ -31,6 +31,7 @@ def double_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def double_encode(obj):
     """Encode an Double object into a tag."""
@@ -142,4 +143,4 @@ class TestDouble(unittest.TestCase):
         double_endec(-inf, 'fff0000000000000')
 
         nan = float('nan')
-        double_endec(nan, '7ff8000000000000')
+        double_endec(nan, '7ff8000000000000')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_enumerated.py b/tests/test_primitive_data/test_enumerated.py
index dff379c..67d823c 100644
--- a/tests/test_primitive_data/test_enumerated.py
+++ b/tests/test_primitive_data/test_enumerated.py
@@ -29,6 +29,7 @@ def enumerated_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def enumerated_encode(obj):
     """Encode an Enumerated object into a tag."""
@@ -137,4 +138,4 @@ class TestEnumerated(unittest.TestCase):
         enumerated_endec(8388608, '800000')
 
         enumerated_endec(2147483647, '7fffffff')
-        enumerated_endec(2147483648, '80000000')
+        enumerated_endec(2147483648, '80000000')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_integer.py b/tests/test_primitive_data/test_integer.py
index 5d61daf..5ff144a 100644
--- a/tests/test_primitive_data/test_integer.py
+++ b/tests/test_primitive_data/test_integer.py
@@ -29,6 +29,7 @@ def integer_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def integer_encode(obj):
     """Encode an Integer object into a tag."""
@@ -138,4 +139,4 @@ class TestInteger(unittest.TestCase):
         integer_endec(-8388608, '800000')
 
         integer_endec(2147483647, '7fffffff')
-        integer_endec(-2147483648, '80000000')
+        integer_endec(-2147483648, '80000000')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_null.py b/tests/test_primitive_data/test_null.py
index 4599475..8d6962a 100644
--- a/tests/test_primitive_data/test_null.py
+++ b/tests/test_primitive_data/test_null.py
@@ -27,6 +27,7 @@ def null_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def null_encode(obj):
     """Encode an Integer object into a tag."""
@@ -103,4 +104,4 @@ class TestNull(unittest.TestCase):
     def test_null_endec(self):
         if _debug: TestInteger._debug("test_null_endec")
 
-        null_endec((), '')
+        null_endec((), '')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_object_identifier.py b/tests/test_primitive_data/test_object_identifier.py
index bc28726..d14f161 100644
--- a/tests/test_primitive_data/test_object_identifier.py
+++ b/tests/test_primitive_data/test_object_identifier.py
@@ -137,4 +137,4 @@ class TestObjectIdentifier(unittest.TestCase):
         # test standard types
         object_identifier_endec(('analogInput', 0), '00000000')
 
-        # test vendor types
+        # test vendor types
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_object_type.py b/tests/test_primitive_data/test_object_type.py
index 1daa106..62b8eb0 100644
--- a/tests/test_primitive_data/test_object_type.py
+++ b/tests/test_primitive_data/test_object_type.py
@@ -39,6 +39,7 @@ def object_type_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def object_type_encode(obj):
     """Encode an ObjectType object into a tag."""
@@ -173,4 +174,4 @@ class TestObjectType(unittest.TestCase):
         object_type_endec('analogOutput', '01')
 
         object_type_endec(127, '7f')
-        object_type_endec(128, '80')
+        object_type_endec(128, '80')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_octet_string.py b/tests/test_primitive_data/test_octet_string.py
index 2eead7c..f344728 100644
--- a/tests/test_primitive_data/test_octet_string.py
+++ b/tests/test_primitive_data/test_octet_string.py
@@ -30,6 +30,7 @@ def octet_string_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def octet_string_encode(obj):
     """Encode an OctetString object into a tag."""
@@ -125,4 +126,4 @@ class TestOctetString(unittest.TestCase):
         octet_string_endec('01')
         octet_string_endec('0102')
         octet_string_endec('010203')
-        octet_string_endec('01020304')
+        octet_string_endec('01020304')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_real.py b/tests/test_primitive_data/test_real.py
index 6a2643a..68b5e67 100644
--- a/tests/test_primitive_data/test_real.py
+++ b/tests/test_primitive_data/test_real.py
@@ -31,6 +31,7 @@ def real_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def real_encode(obj):
     """Encode an Real object into a tag."""
@@ -143,4 +144,4 @@ class TestReal(unittest.TestCase):
         real_endec(-inf, 'ff800000')
 
         nan = float('nan')
-        real_endec(nan, '7fc00000')
+        real_endec(nan, '7fc00000')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_tag.py b/tests/test_primitive_data/test_tag.py
index 1bcfa84..d56b545 100644
--- a/tests/test_primitive_data/test_tag.py
+++ b/tests/test_primitive_data/test_tag.py
@@ -592,4 +592,4 @@ class TestTagList(unittest.TestCase):
 
         taglist = TagList()
         taglist.decode(data)
-        assert taglist.tagList == [tag0, tag1, tag2]
+        assert taglist.tagList == [tag0, tag1, tag2]
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_time.py b/tests/test_primitive_data/test_time.py
index 8d13197..2c5e84b 100644
--- a/tests/test_primitive_data/test_time.py
+++ b/tests/test_primitive_data/test_time.py
@@ -29,6 +29,7 @@ def time_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def time_encode(obj):
     """Encode an Time object into a tag."""
@@ -140,4 +141,4 @@ class TestTime(unittest.TestCase):
         time_endec((1, 0, 0, 0), '01000000')
         time_endec((0, 2, 0, 0), '00020000')
         time_endec((0, 0, 3, 0), '00000300')
-        time_endec((0, 0, 0, 4), '00000004')
+        time_endec((0, 0, 0, 4), '00000004')
\ No newline at end of file
diff --git a/tests/test_primitive_data/test_unsigned.py b/tests/test_primitive_data/test_unsigned.py
index 5c4e44f..7cc7e5f 100644
--- a/tests/test_primitive_data/test_unsigned.py
+++ b/tests/test_primitive_data/test_unsigned.py
@@ -29,6 +29,7 @@ def unsigned_tag(x):
 
     return tag
 
+
 @bacpypes_debugging
 def unsigned_encode(obj):
     """Encode an Unsigned object into a tag."""
@@ -137,4 +138,4 @@ class TestUnsigned(unittest.TestCase):
         unsigned_endec(8388608, '800000')
 
         unsigned_endec(2147483647, '7fffffff')
-        unsigned_endec(2147483648, '80000000')
+        unsigned_endec(2147483648, '80000000')
\ No newline at end of file
diff --git a/tests/test_utilities/__init__.py b/tests/test_utilities/__init__.py
index e63dfc0..412a5f3 100644
--- a/tests/test_utilities/__init__.py
+++ b/tests/test_utilities/__init__.py
@@ -7,6 +7,10 @@ Test Utilities
 This module tests the test utilities.
 """
 
+from . import trapped_classes
+
 from . import test_state_machine
+from . import test_time_machine
+
 from . import test_client_state_machine
-from . import test_server_state_machine
+from . import test_server_state_machine
\ No newline at end of file
diff --git a/tests/test_utilities/test_state_machine.py b/tests/test_utilities/test_state_machine.py
index 22ba270..d1d8478 100644
--- a/tests/test_utilities/test_state_machine.py
+++ b/tests/test_utilities/test_state_machine.py
@@ -62,6 +62,7 @@ class TestState(unittest.TestCase):
     def test_something_else(self):
         if _debug: TestState._debug("test_something_else")
 
+
 @bacpypes_debugging
 class TestStateMachine(unittest.TestCase):
 
diff --git a/tests/test_utilities/test_time_machine.py b/tests/test_utilities/test_time_machine.py
index fcce5a2..2ed2a02 100644
--- a/tests/test_utilities/test_time_machine.py
+++ b/tests/test_utilities/test_time_machine.py
@@ -21,14 +21,9 @@ _log = ModuleLogger(globals())
 # reference to time machine
 time_machine = None
 
-#
-#   setUpModule
-#
-
-
 @bacpypes_debugging
-def setUpModule():
-    if _debug: setUpModule._debug("setUpModule")
+def setup_module(module):
+    if _debug: setup_module._debug("setup_module %r", module)
     global time_machine
 
     # this is a singleton
@@ -40,18 +35,14 @@ def setUpModule():
 
 
 @bacpypes_debugging
-def tearDownModule():
-    if _debug: tearDownModule._debug("tearDownModule")
+def teardown_module():
+    if _debug: teardown_module._debug("teardown_module")
     global time_machine
 
     # all done
     time_machine = None
 
 
-#
-#   SampleOneShotTask
-#
-
 @bacpypes_debugging
 class SampleOneShotTask(OneShotTask):
 
@@ -66,10 +57,6 @@ class SampleOneShotTask(OneShotTask):
         self.process_task_called += 1
 
 
-#
-#   sample_task_function
-#
-
 # flag to make sure the function was called
 sample_task_function_called = 0
 
@@ -82,10 +69,6 @@ def sample_task_function(*args, **kwargs):
     sample_task_function_called += 1
 
 
-#
-#   SampleRecurringTask
-#
-
 @bacpypes_debugging
 class SampleRecurringTask(RecurringTask):
 
@@ -203,4 +186,4 @@ class TestTimeMachine(unittest.TestCase):
         # function called, no time has passed
         assert ft1.process_task_called == 4
         assert ft2.process_task_called == 3
-        assert time_machine.current_time == 5.0
+        assert time_machine.current_time == 5.0
\ No newline at end of file
diff --git a/tests/test_utilities/trapped_classes.py b/tests/test_utilities/trapped_classes.py
index 315f38e..1c0e33f 100755
--- a/tests/test_utilities/trapped_classes.py
+++ b/tests/test_utilities/trapped_classes.py
@@ -194,11 +194,8 @@ class TrappedStateMachine(StateMachine):
         # must be identical objects
         return pdu is transition_pdu
 
-#
-#   TrappedClient
-#
-
 
+@bacpypes_debugging
 class TrappedClient(Client):
 
     """
@@ -231,14 +228,8 @@ class TrappedClient(Client):
         # a reference for checking
         self.confirmation_received = pdu
 
-bacpypes_debugging(TrappedClient)
-
-
-#
-#   TrappedServer
-#
-
 
+@bacpypes_debugging
 class TrappedServer(Server):
 
     """
@@ -269,6 +260,4 @@ class TrappedServer(Server):
         self.response_sent = pdu
 
         # continue with processing
-        Server.response(self, pdu)
-
-bacpypes_debugging(TrappedServer)
+        Server.response(self, pdu)
\ No newline at end of file
diff --git a/tests/test_vlan/__init__.py b/tests/test_vlan/__init__.py
new file mode 100644
index 0000000..fdffa2a
--- /dev/null
+++ b/tests/test_vlan/__init__.py
@@ -0,0 +1 @@
+# placeholder
diff --git a/tests/time_machine.py b/tests/time_machine.py
index b19fefd..fef0210 100755
--- a/tests/time_machine.py
+++ b/tests/time_machine.py
@@ -20,9 +20,6 @@ _log = ModuleLogger(globals())
 # time machine
 time_machine = None
 
-#
-#   TimeMachine
-#
 
 # @bacpypes_debugging - implicit via metaclass
 class TimeMachine(_TaskManager):
@@ -113,9 +110,6 @@ class TimeMachine(_TaskManager):
 
         _TaskManager.process_task(self, task)
 
-#
-#   reset_time_machine
-#
 
 @bacpypes_debugging
 def reset_time_machine():
@@ -133,9 +127,6 @@ def reset_time_machine():
     time_machine.current_time = 0.0
     time_machine.time_limit = None
 
-#
-#   run_time_machine
-#
 
 @bacpypes_debugging
 def run_time_machine(time_limit):
diff --git a/tests/utilities.py b/tests/utilities.py
index 1052817..daf182e 100644
--- a/tests/utilities.py
+++ b/tests/utilities.py
@@ -26,37 +26,30 @@ BACPYPES_TEST_OPTION = ""
 test_options = None
 
 
-#
-#   setUpPackage
-#
-
 @bacpypes_debugging
-def setUpPackage():
+def setup_package():
     global test_options
 
     # create an argument parser
     parser = ArgumentParser(description=__doc__)
 
     # add an option
-    parser.add_argument('--option', help="this is an option",
-                        default=os.getenv("BACPYPES_TEST_OPTION") or BACPYPES_TEST_OPTION,
-                        )
+    parser.add_argument(
+        '--option', help="this is an option",
+        default=os.getenv("BACPYPES_TEST_OPTION") or BACPYPES_TEST_OPTION,
+        )
 
     # get the debugging args and parse them
     arg_str = os.getenv("BACPYPES_TEST") or BACPYPES_TEST
     test_options = parser.parse_args(arg_str.split())
 
-    if _debug: setUpPackage._debug("setUpPackage")
-    if _debug: setUpPackage._debug("    - test_options: %r", test_options)
+    if _debug: setup_package._debug("setup_package")
+    if _debug: setup_package._debug("    - test_options: %r", test_options)
 
     time_machine = TimeMachine()
-    if _debug: setUpPackage._debug("    - time_machine: %r", time_machine)
-
-#
-#   tearDownPackage
-#
+    if _debug: setup_package._debug("    - time_machine: %r", time_machine)
 
 
 @bacpypes_debugging
-def tearDownPackage():
-    if _debug: tearDownPackage._debug("tearDownPackage")
\ No newline at end of file
+def teardown_package():
+    if _debug: teardown_package._debug("teardown_package")
diff --git a/tox.ini b/tox.ini
index b9ac581..b3bee34 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,6 @@
 envlist = py27, py34
 
 [testenv]
-setenv =
-    PYTHONPATH = {toxinidir}:{toxinidir}/mongotree
 commands = python setup.py test
 deps =
     -r{toxinidir}/requirements.txt