diff --git a/neutron/agent/ovsdb/impl_idl.py b/neutron/agent/ovsdb/impl_idl.py
index aa0de3ff0ef..d946712f1cd 100644
--- a/neutron/agent/ovsdb/impl_idl.py
+++ b/neutron/agent/ovsdb/impl_idl.py
@@ -64,7 +64,7 @@ class Transaction(api.Transaction):
     def commit(self):
         self.ovsdb_connection.queue_txn(self)
         try:
-            result = self.results.get(self.timeout)
+            result = self.results.get(timeout=self.timeout)
         except Queue.Empty:
             raise api.TimeoutException(
                 _("Commands %(commands)s exceeded timeout %(timeout)d "
diff --git a/neutron/tests/unit/agent/ovsdb/test_impl_idl.py b/neutron/tests/unit/agent/ovsdb/test_impl_idl.py
index ccff6c3d0f9..5d2a3e6a981 100644
--- a/neutron/tests/unit/agent/ovsdb/test_impl_idl.py
+++ b/neutron/tests/unit/agent/ovsdb/test_impl_idl.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 import mock
-from six.moves import queue
 import testtools
 
 from neutron.agent.ovsdb import api
@@ -23,10 +22,9 @@ from neutron.tests import base
 
 class TransactionTestCase(base.BaseTestCase):
     def test_commit_raises_exception_on_timeout(self):
-        with mock.patch.object(queue, 'Queue') as mock_queue:
-            transaction = impl_idl.NeutronOVSDBTransaction(mock.sentinel,
-                                                           mock.Mock(), 0)
-            mock_queue.return_value.get.side_effect = queue.Empty
+        transaction = impl_idl.NeutronOVSDBTransaction(mock.sentinel,
+                                                       mock.Mock(), 1)
+        with self.assert_max_execution_time(10):
             with testtools.ExpectedException(api.TimeoutException):
                 transaction.commit()