diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b942b1589..2ed466176e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,7 @@ ubuntu:
       metrics: build/metrics.txt
   parallel:
     matrix:
-      - IMAGE : [ "ubuntu:22.04" ]
+      - IMAGE : [ "ubuntu:24.04" ]
         CXX: [ g++ ]
         BUILD_TYPE : [ "RelWithDebInfo" ]
         TA_PYTHON : [ "TA_PYTHON=OFF" ]
diff --git a/tests/tensor.cpp b/tests/tensor.cpp
index 34ea8f5d3d..3e67f89469 100644
--- a/tests/tensor.cpp
+++ b/tests/tensor.cpp
@@ -27,8 +27,6 @@
 #include "tiledarray.h"
 #include "unit_test_config.h"
 
-const TensorFixture::range_type TensorFixture::r = make_range(81);
-
 BOOST_FIXTURE_TEST_SUITE(tensor_suite, TensorFixture, TA_UT_LABEL_SERIAL)
 
 BOOST_AUTO_TEST_CASE(anatomy) {
diff --git a/tests/tensor_fixture.h b/tests/tensor_fixture.h
index 77d09a1427..7f1e2a272f 100644
--- a/tests/tensor_fixture.h
+++ b/tests/tensor_fixture.h
@@ -41,9 +41,11 @@ struct TensorFixture {
   typedef TensorN::range_type::index_view_type index_view_type;
   typedef TensorN::range_type range_type;
 
-  static const range_type r;
+  const range_type r;
 
-  TensorFixture() : t(r) { rand_fill(18, t.size(), t.data()); }
+  TensorFixture() : r(make_range(81)), t(r) {
+    rand_fill(18, t.size(), t.data());
+  }
 
   ~TensorFixture() {}
 
diff --git a/tests/tensor_um.cpp b/tests/tensor_um.cpp
index d860b7c813..8d90dd0e1d 100644
--- a/tests/tensor_um.cpp
+++ b/tests/tensor_um.cpp
@@ -32,9 +32,11 @@ struct TensorUMFixture {
   typedef TensorN::range_type::index_view_type* index_view_type;
   typedef TensorN::range_type range_type;
 
-  static const range_type r;
+  const range_type r;
 
-  TensorUMFixture() : t(r) { rand_fill(18, t.size(), t.data()); }
+  TensorUMFixture() : r(make_range(81)), t(r) {
+    rand_fill(18, t.size(), t.data());
+  }
 
   ~TensorUMFixture() {}
 
@@ -85,8 +87,6 @@ struct TensorUMFixture {
   TensorN t;
 };
 
-const TensorUMFixture::range_type TensorUMFixture::r = make_range(81);
-
 BOOST_FIXTURE_TEST_SUITE(tensor_um_suite, TensorUMFixture, TA_UT_LABEL_SERIAL)
 
 BOOST_AUTO_TEST_CASE(default_constructor) {