diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp
index c16b49d7..7af5fc91 100644
--- a/tests/tests/block_tests.cpp
+++ b/tests/tests/block_tests.cpp
@@ -967,31 +967,4 @@ BOOST_FIXTURE_TEST_CASE( rsf_missed_blocks, database_fixture )
    FC_LOG_AND_RETHROW()
 }
 
-BOOST_FIXTURE_TEST_CASE( account_create_fee_scaling, database_fixture )
-{ try {
-   auto accounts_per_scale = db.get_global_properties().parameters.accounts_per_fee_scale;
-   db.modify(global_property_id_type()(db), [](global_property_object& gpo)
-   {
-      gpo.parameters.current_fees = fee_schedule::get_default();
-      gpo.parameters.current_fees->get<account_create_operation>().basic_fee = 1;
-   });
-
-   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 1);
-   for( int i = db.get_dynamic_global_properties().accounts_registered_this_interval; i < accounts_per_scale; ++i )
-      create_account("shill" + fc::to_string(i));
-   generate_block();
-   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 16);
-   for( int i = 0; i < accounts_per_scale; ++i )
-      create_account("moreshills" + fc::to_string(i));
-   generate_block();
-   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 256);
-   for( int i = 0; i < accounts_per_scale; ++i )
-      create_account("moarshills" + fc::to_string(i));
-   generate_block();
-   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 4096);
-
-   generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
-   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 1);
-} FC_LOG_AND_RETHROW() }
-
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/tests/fee_tests.cpp b/tests/tests/fee_tests.cpp
index 0865216b..ca801178 100644
--- a/tests/tests/fee_tests.cpp
+++ b/tests/tests/fee_tests.cpp
@@ -425,4 +425,31 @@ REG : net' ltm' ref'
 
 } FC_LOG_AND_RETHROW() }
 
+BOOST_AUTO_TEST_CASE( account_create_fee_scaling )
+{ try {
+   auto accounts_per_scale = db.get_global_properties().parameters.accounts_per_fee_scale;
+   db.modify(global_property_id_type()(db), [](global_property_object& gpo)
+   {
+      gpo.parameters.current_fees = fee_schedule::get_default();
+      gpo.parameters.current_fees->get<account_create_operation>().basic_fee = 1;
+   });
+
+   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 1);
+   for( int i = db.get_dynamic_global_properties().accounts_registered_this_interval; i < accounts_per_scale; ++i )
+      create_account("shill" + fc::to_string(i));
+   generate_block();
+   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 16);
+   for( int i = 0; i < accounts_per_scale; ++i )
+      create_account("moreshills" + fc::to_string(i));
+   generate_block();
+   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 256);
+   for( int i = 0; i < accounts_per_scale; ++i )
+      create_account("moarshills" + fc::to_string(i));
+   generate_block();
+   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 4096);
+
+   generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
+   BOOST_CHECK_EQUAL(db.get_global_properties().parameters.current_fees->get<account_create_operation>().basic_fee, 1);
+} FC_LOG_AND_RETHROW() }
+
 BOOST_AUTO_TEST_SUITE_END()