diff --git a/Event/xAOD/xAODEventInfo/CMakeLists.txt b/Event/xAOD/xAODEventInfo/CMakeLists.txt
index 8dddfcc70392cff8e965c1cfce66002071c9280d..fec4b88e6f3a3184d2d14f012d9a8a92c56331c3 100644
--- a/Event/xAOD/xAODEventInfo/CMakeLists.txt
+++ b/Event/xAOD/xAODEventInfo/CMakeLists.txt
@@ -45,8 +45,8 @@ atlas_add_test( ut_xaodeventinfo_subevent_test
    SOURCES test/ut_xaodeventinfo_subevent_test.cxx
    LINK_LIBRARIES AthLinks xAODCore xAODEventInfo )
 
-atlas_add_test( ut_xaodeventinfo_eventauxinfo_v1_test
-   SOURCES test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
+atlas_add_test( ut_xaodeventinfo_eventauxinfo_test
+   SOURCES test/ut_xaodeventinfo_eventauxinfo_test.cxx
    LINK_LIBRARIES AthLinks xAODCore xAODEventInfo )
 
 atlas_add_test( ut_xaodeventinfo_eventinfoauxcontainer_v1_test
diff --git a/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_test.ref b/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..8a61c65fd039b4082694374b82c46e68005112fe
--- /dev/null
+++ b/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_test.ref
@@ -0,0 +1,2 @@
+ut_xaodeventinfo_eventauxinfo_test
+test1
diff --git a/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_v1_test.ref b/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_v1_test.ref
deleted file mode 100644
index c94516e86fac6fefe0b80785796104c3088769c7..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_v1_test.ref
+++ /dev/null
@@ -1,2 +0,0 @@
-ut_xaodeventinfo_eventauxinfo_v1_test
-test1
diff --git a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_test.cxx
similarity index 86%
rename from Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
rename to Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_test.cxx
index a8bad2a142701b7adf50e06ff9390e05c8545613..15c65ec6d53af6fa811411bbb9f386b98a6ddd6f 100644
--- a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
+++ b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_test.cxx
@@ -1,17 +1,17 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /*
  */
 /**
- * @file xAODEventInfo/test/ut_xoadeventinfo_eventauxinfo_v1_test.cxx
+ * @file xAODEventInfo/test/ut_xoadeventinfo_eventauxinfo_test.cxx
  * @author scott snyder <snyder@bnl.gov>
  * @date Apr, 2018
- * @brief Unit tests for EventAuxInfo_v1.
+ * @brief Unit tests for EventAuxInfo.
  */
 
 #undef NDEBUG
-#include "xAODEventInfo/versions/EventAuxInfo_v1.h"
+#include "xAODEventInfo/EventAuxInfo.h"
 #include "AthContainers/AuxTypeRegistry.h"
 #include "AthContainers/exceptions.h"
 #include "TestTools/expect_exception.h"
@@ -24,7 +24,7 @@ void test1()
   std::cout << "test1\n";
 
   SG::AuxTypeRegistry& r = SG::AuxTypeRegistry::instance();
-  xAOD::EventAuxInfo_v1 eai;
+  xAOD::EventAuxInfo eai;
 
   SG::auxid_t runid = r.findAuxID ("runNumber");
   SG::auxid_t pixid = r.findAuxID ("pixelFlags");
@@ -74,7 +74,7 @@ void test1()
 
 int main()
 {
-  std::cout << "ut_xaodeventinfo_eventauxinfo_v1_test\n";
+  std::cout << "ut_xaodeventinfo_eventauxinfo_test\n";
   test1();
   return 0;
 }