diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
index 825391d9576..c60b7b68ccb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
@@ -28,7 +28,7 @@
 #include "jni_tools.h"
 #include "jvmti_tools.h"
 #include "JVMTITools.h"
-#include "nsk_list.h"
+#include "nsk_list.hpp"
 
 extern "C" {
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp
index a9f0321c3bd..c9579abc4b8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp
@@ -28,7 +28,7 @@
 #include "jni_tools.h"
 #include "jvmti_tools.h"
 #include "JVMTITools.h"
-#include "nsk_list.h"
+#include "nsk_list.hpp"
 
 extern "C" {
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/README b/test/hotspot/jtreg/vmTestbase/nsk/share/native/README
index 38fbab872f0..f6c18e86e8f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/README
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/README
@@ -46,8 +46,8 @@ The following source files declares a set of functions which
 provides support for lists of various objects
 
     Source files:
-        nsk_list.h
-        nsk_list.c
+        nsk_list.hpp
+        nsk_list.cpp
 
     Naming conventions:
         functions: nsk_list_*
@@ -119,7 +119,7 @@ Provides platform-independent support for running native threads:
 
 ---------------------------------------------------------------------------------
 
-nsk_list.h
+nsk_list.hpp
 
 Provides support for lists of various objects:
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
index 63708bd84f4..068c92bf807 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nsk_list.h"
+#include "nsk_list.hpp"
 #include "nsk_tools.h"
 
 extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.h b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.hpp
similarity index 96%
rename from test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.h
rename to test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.hpp
index 546e1db22bc..82efc3c909a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it