diff --git a/test/addons/at-exit/binding.cc b/test/addons/at-exit/binding.cc
deleted file mode 100644
index b091c65ed91eeb..00000000000000
--- a/test/addons/at-exit/binding.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <assert.h>
-#include <stdlib.h>
-#include <node.h>
-#include <v8.h>
-
-// TODO(addaleax): Maybe merge this file with the cctest for AtExit()?
-
-using node::AtExit;
-using node::Environment;
-using node::GetCurrentEnvironment;
-using v8::HandleScope;
-using v8::Isolate;
-using v8::Local;
-using v8::Object;
-
-#if defined(_MSC_VER)
-#pragma section(".CRT$XPU", read)
-#define NODE_C_DTOR(fn)                                               \
-  NODE_CTOR_PREFIX void __cdecl fn(void);                             \
-  __declspec(dllexport, allocate(".CRT$XPU"))                         \
-      void (__cdecl*fn ## _)(void) = fn;                              \
-  NODE_CTOR_PREFIX void __cdecl fn(void)
-#else
-#define NODE_C_DTOR(fn)                                               \
-  NODE_CTOR_PREFIX void fn(void) __attribute__((destructor));         \
-  NODE_CTOR_PREFIX void fn(void)
-#endif
-
-static char cookie[] = "yum yum";
-static int at_exit_cb1_called = 0;
-static int at_exit_cb2_called = 0;
-
-static void at_exit_cb1(void* arg) {
-  Isolate* isolate = static_cast<Isolate*>(arg);
-  HandleScope handle_scope(isolate);
-  Local<Object> obj = Object::New(isolate);
-  assert(!obj.IsEmpty());  // Assert VM is still alive.
-  assert(obj->IsObject());
-  at_exit_cb1_called++;
-}
-
-static void at_exit_cb2(void* arg) {
-  assert(arg == static_cast<void*>(cookie));
-  at_exit_cb2_called++;
-}
-
-NODE_C_DTOR(sanity_check) {
-  assert(at_exit_cb1_called == 1);
-  assert(at_exit_cb2_called == 2);
-}
-
-void init(Local<Object> exports) {
-  Environment* env = GetCurrentEnvironment(exports->CreationContext());
-  AtExit(env, at_exit_cb1, exports->GetIsolate());
-  AtExit(env, at_exit_cb2, cookie);
-  AtExit(env, at_exit_cb2, cookie);
-}
-
-NODE_MODULE(NODE_GYP_MODULE_NAME, init)
diff --git a/test/addons/at-exit/binding.gyp b/test/addons/at-exit/binding.gyp
deleted file mode 100644
index 55fbe7050f18e4..00000000000000
--- a/test/addons/at-exit/binding.gyp
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'binding',
-      'sources': [ 'binding.cc' ],
-      'includes': ['../common.gypi'],
-    }
-  ]
-}
diff --git a/test/addons/at-exit/test.js b/test/addons/at-exit/test.js
deleted file mode 100644
index 4e2ca810f01c87..00000000000000
--- a/test/addons/at-exit/test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-const common = require('../../common');
-require(`./build/${common.buildType}/binding`);
diff --git a/test/cctest/test_environment.cc b/test/cctest/test_environment.cc
index 4045a7d2a4bba5..cc9b8e4531f6ef 100644
--- a/test/cctest/test_environment.cc
+++ b/test/cctest/test_environment.cc
@@ -12,10 +12,12 @@ static bool called_cb_1 = false;
 static bool called_cb_2 = false;
 static bool called_cb_ordered_1 = false;
 static bool called_cb_ordered_2 = false;
+static bool called_at_exit_js = false;
 static void at_exit_callback1(void* arg);
 static void at_exit_callback2(void* arg);
 static void at_exit_callback_ordered1(void* arg);
 static void at_exit_callback_ordered2(void* arg);
+static void at_exit_js(void* arg);
 static std::string cb_1_arg;  // NOLINT(runtime/string)
 
 class EnvironmentTest : public EnvironmentTestFixture {
@@ -91,6 +93,17 @@ TEST_F(EnvironmentTest, AtExitWithArgument) {
   EXPECT_EQ(arg, cb_1_arg);
 }
 
+TEST_F(EnvironmentTest, AtExitRunsJS) {
+  const v8::HandleScope handle_scope(isolate_);
+  const Argv argv;
+  Env env {handle_scope, argv};
+
+  AtExit(*env, at_exit_js, static_cast<void*>(isolate_));
+  EXPECT_FALSE(called_at_exit_js);
+  RunAtExit(*env);
+  EXPECT_TRUE(called_at_exit_js);
+}
+
 TEST_F(EnvironmentTest, MultipleEnvironmentsPerIsolate) {
   const v8::HandleScope handle_scope(isolate_);
   const Argv argv;
@@ -163,3 +176,12 @@ static void at_exit_callback_ordered2(void* arg) {
   EXPECT_FALSE(called_cb_ordered_1);
   called_cb_ordered_2 = true;
 }
+
+static void at_exit_js(void* arg) {
+  v8::Isolate* isolate = static_cast<v8::Isolate*>(arg);
+  v8::HandleScope handle_scope(isolate);
+  v8::Local<v8::Object> obj = v8::Object::New(isolate);
+  assert(!obj.IsEmpty());  // Assert VM is still alive.
+  assert(obj->IsObject());
+  called_at_exit_js = true;
+}