diff --git a/core/clingutils/src/complexLinkdef.h b/core/clingutils/src/complexLinkdef.h
index 855a5824199d9..b7d78993fa25b 100644
--- a/core/clingutils/src/complexLinkdef.h
+++ b/core/clingutils/src/complexLinkdef.h
@@ -3,6 +3,17 @@
 
 #pragma extra_include "root_std_complex.h";
 
+#ifdef _WIN32
+#pragma create TClass _C_float_complex+;
+#pragma create TClass _Complex_base<float,_C_float_complex>+;
+#pragma create TClass _C_double_complex+;
+#pragma create TClass _Complex_base<double,_C_double_complex>+;
+#pragma create TClass _Complex_value<int>+;
+#pragma create TClass _Complex_value<long>+;
+#pragma create TClass _Complex_base<int,_Complex_value<int>>+;
+#pragma create TClass _Complex_base<long,_Complex_value<long>>+;
+#endif
+
 #pragma create TClass complex<int>+;
 #pragma create TClass complex<long>+;
 #pragma create TClass complex<float>+;
diff --git a/roottest/root/io/newstl/CMakeLists.txt b/roottest/root/io/newstl/CMakeLists.txt
index 7b95839fb5086..9fb01172db3a5 100644
--- a/roottest/root/io/newstl/CMakeLists.txt
+++ b/roottest/root/io/newstl/CMakeLists.txt
@@ -52,7 +52,7 @@ endif()
 ROOTTEST_ADD_TEST(ComplexTest
                   MACRO runComplexTest.C
                   ROOTEXE_OPTS ${_complextest_load}
-                  OUTREF ComplexTest${ref_suffix}
+                  OUTREF ComplexTest.ref
                   FIXTURES_REQUIRED root-io-newstl-ComplexTest_h-fixture)
 
 ROOTTEST_ADD_TEST(SampleFile
diff --git a/roottest/root/io/newstl/ComplexTest.h b/roottest/root/io/newstl/ComplexTest.h
index d853262680aa0..3b012c8823083 100644
--- a/roottest/root/io/newstl/ComplexTest.h
+++ b/roottest/root/io/newstl/ComplexTest.h
@@ -24,9 +24,4 @@ class Test: public TObject
   ClassDefOverride(Test, 1);
 };
 
-#ifdef __ROOTCLING__
-#pragma link C++ class std::complex<double>+;
-#pragma link C++ class Test+;
-#endif
-
 #endif /* Test_hh */
diff --git a/roottest/root/io/newstl/ComplexTest_win32.ref b/roottest/root/io/newstl/ComplexTest_win32.ref
deleted file mode 100644
index da4dad5a07dcf..0000000000000
--- a/roottest/root/io/newstl/ComplexTest_win32.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Processing runComplexTest.C...
-Warning in <TStreamerInfo::Build>: _Complex_base<double,_C_double_complex>: base class _C_double_complex has no streamer or dictionary it will not be saved
-Warning in <TStreamerInfo::Build>: complex<double>: base class _Complex_base<double,_C_double_complex> has no streamer or dictionary it will not be saved
-The complex object was set properly:
-3 6
-The complex object was read properly:
-3 6
diff --git a/roottest/root/io/newstl/ComplexTest_win64.ref b/roottest/root/io/newstl/ComplexTest_win64.ref
deleted file mode 100644
index da4dad5a07dcf..0000000000000
--- a/roottest/root/io/newstl/ComplexTest_win64.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Processing runComplexTest.C...
-Warning in <TStreamerInfo::Build>: _Complex_base<double,_C_double_complex>: base class _C_double_complex has no streamer or dictionary it will not be saved
-Warning in <TStreamerInfo::Build>: complex<double>: base class _Complex_base<double,_C_double_complex> has no streamer or dictionary it will not be saved
-The complex object was set properly:
-3 6
-The complex object was read properly:
-3 6