diff --git a/src/env.cc b/src/env.cc
index 0087f719dc00db..5bd75abab34512 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -76,6 +76,10 @@ void Environment::Start(int argc,
       reinterpret_cast<uv_handle_t*>(&idle_check_handle_),
       close_and_finish,
       nullptr);
+  RegisterHandleCleanup(
+      reinterpret_cast<uv_handle_t*>(&destroy_ids_timer_handle_),
+      close_and_finish,
+      nullptr);
 
   if (start_profiler_idle_notifier) {
     StartProfilerIdleNotifier();
diff --git a/test/cctest/test_environment.cc b/test/cctest/test_environment.cc
index db08743261c843..aee8e795ecb6ab 100644
--- a/test/cctest/test_environment.cc
+++ b/test/cctest/test_environment.cc
@@ -41,9 +41,9 @@ class EnvironmentTest : public NodeTestFixture {
     }
 
     ~Env() {
-      FreeIsolateData(isolate_data_);
       environment_->CleanupHandles();
       FreeEnvironment(environment_);
+      FreeIsolateData(isolate_data_);
     }
 
     Environment* operator*() const {
@@ -85,7 +85,7 @@ TEST_F(EnvironmentTest, AtExitWithArgument) {
   EXPECT_EQ(arg, cb_1_arg);
 }
 
-TEST_F(EnvironmentTest, DISABLED_MultipleEnvironmentsPerIsolate) {
+TEST_F(EnvironmentTest, MultipleEnvironmentsPerIsolate) {
   const v8::HandleScope handle_scope(isolate_);
   const Argv argv;
   Env env1 {handle_scope, isolate_, argv};