2 files changed, 14 insertions, 13 deletions
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index 033313dbe2..3d3b2ad844 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -58,7 +58,12 @@ EmbedderTest::EmbedderTest()
 #endif  // FPDF_ENABLE_V8
 }
 
-EmbedderTest::~EmbedderTest() {}
+EmbedderTest::~EmbedderTest() {
+#ifdef PDF_ENABLE_V8
+  v8::V8::ShutdownPlatform();
+  delete platform_;
+#endif  // PDF_ENABLE_V8
+}
 
 void EmbedderTest::SetUp() {
   FPDF_LIBRARY_CONFIG config;
@@ -93,11 +98,6 @@ void EmbedderTest::TearDown() {
   FPDFAvail_Destroy(avail_);
   FPDF_DestroyLibrary();
 
-#ifdef PDF_ENABLE_V8
-  v8::V8::ShutdownPlatform();
-  delete platform_;
-#endif  // PDF_ENABLE_V8
-
   delete loader_;
 }
 
diff --git a/testing/js_embedder_test.cpp b/testing/js_embedder_test.cpp
index ffa647d073..4815cd54a3 100644
--- a/testing/js_embedder_test.cpp
+++ b/testing/js_embedder_test.cpp
@@ -5,17 +5,16 @@
 #include "testing/js_embedder_test.h"
 
 JSEmbedderTest::JSEmbedderTest()
-    : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator) {
+    : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator),
+      m_pIsolate(nullptr) {}
+
+JSEmbedderTest::~JSEmbedderTest() {}
+
+void JSEmbedderTest::SetUp() {
   v8::Isolate::CreateParams params;
   params.array_buffer_allocator = m_pArrayBufferAllocator.get();
   m_pIsolate = v8::Isolate::New(params);
-}
 
-JSEmbedderTest::~JSEmbedderTest() {
-  m_pIsolate->Dispose();
-}
-
-void JSEmbedderTest::SetUp() {
   EmbedderTest::SetExternalIsolate(m_pIsolate);
   EmbedderTest::SetUp();
 
@@ -34,6 +33,8 @@ void JSEmbedderTest::TearDown() {
   m_pPersistentContext.Reset();
   FXJS_Release();
   EmbedderTest::TearDown();
+  m_pIsolate->Dispose();
+  m_pIsolate = nullptr;
 }
 
 v8::Isolate* JSEmbedderTest::isolate() {