Fix test failures if date.timezone is not set

closes 1474
Merge bb86ec1 (from 1.0)

* 1.0:
  bb86ec1 Fix test failures if date.timezone is not set