Workaround for tests in Python 3.4

related bug: http://bugs.python.org/issue21750
Merge branch 'patch-1'

* patch-1:
  Workaround for tests in Python 3.4