diff --git a/neutron/tests/__init__.py b/neutron/tests/__init__.py
index e69de29bb2d..bacc1911e8e 100644
--- a/neutron/tests/__init__.py
+++ b/neutron/tests/__init__.py
@@ -0,0 +1,14 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import eventlet
+eventlet.monkey_patch()
diff --git a/neutron/tests/functional/agent/linux/simple_daemon.py b/neutron/tests/functional/agent/linux/simple_daemon.py
index 77fba81d497..bcc565cfbfe 100644
--- a/neutron/tests/functional/agent/linux/simple_daemon.py
+++ b/neutron/tests/functional/agent/linux/simple_daemon.py
@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import eventlet
+import time
+
 from oslo_config import cfg
 
 from neutron.agent.linux import daemon
@@ -29,9 +30,8 @@ def main():
 
         def run(self):
             while True:
-                eventlet.sleep(10)
+                time.sleep(10)
 
-    eventlet.monkey_patch()
     opts = [
         cfg.StrOpt('uuid',
                    help=_('uuid provided from the command line '