diff --git a/libraries/chain/database.cpp b/libraries/chain/database.cpp
index 56adf8fe43b7485376d02b79c737b1668fbe1ac7..7e8b065fefc8c9b20474d9d806fd49cb36efff6d 100644
--- a/libraries/chain/database.cpp
+++ b/libraries/chain/database.cpp
@@ -637,7 +637,7 @@ void database::init_genesis(const genesis_state_type& genesis_state)
 { try {
    FC_ASSERT( genesis_state.initial_timestamp != time_point_sec(), "Must initialize genesis timestamp." );
    FC_ASSERT( genesis_state.initial_timestamp.sec_since_epoch() % EOS_BLOCK_INTERVAL_SEC == 0,
-              "Genesis timestamp must be divisible by EOS_DEFAULT_BLOCK_INTERVAL." );
+              "Genesis timestamp must be divisible by EOS_BLOCK_INTERVAL_SEC." );
 
    struct auth_inhibitor {
       auth_inhibitor(database& db) : db(db), old_flags(db.node_properties().skip_flags)
diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp
index b78a5642bff693655dcb1a3e4cec314581b15477..525fcf9c2eca57102372195b39067674704005e2 100644
--- a/tests/common/database_fixture.cpp
+++ b/tests/common/database_fixture.cpp
@@ -38,13 +38,14 @@
 
 #include "database_fixture.hpp"
 
-uint32_t EOS_TESTING_GENESIS_TIMESTAMP = 1431700000;
+uint32_t EOS_TESTING_GENESIS_TIMESTAMP = 1431700005;
 
 namespace eos { namespace chain {
 
 testing_fixture::testing_fixture() {
    default_genesis_state.initial_timestamp = fc::time_point_sec(EOS_TESTING_GENESIS_TIMESTAMP);
-   for (int i = 0; i < default_genesis_state.initial_producers.size(); ++i) {
+   default_genesis_state.immutable_parameters.min_producer_count = 11;
+   for (int i = 0; i < default_genesis_state.immutable_parameters.min_producer_count; ++i) {
       auto name = std::string("init") + fc::to_string(i);
       auto private_key = fc::ecc::private_key::regenerate(fc::sha256::hash(name));
       public_key_type public_key = private_key.get_public_key();