diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index 6d339c8d4e..4cd97a7f43 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -484,8 +484,8 @@ elif [[ "$1" == "bazel.noexcept" ]]; then
   # there are some exceptions and error handling code from the Prometheus Client
   # as well as Opentracing shim (due to some third party code in its Opentracing dependency)
   # that make this test always fail. Ignore these packages in the noexcept test here.
-  bazel $BAZEL_STARTUP_OPTIONS build --copt=-fno-exceptions $BAZEL_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//sdk/test/metrics:attributes_hashmap_test -//opentracing-shim/...
-  bazel $BAZEL_STARTUP_OPTIONS test --copt=-fno-exceptions $BAZEL_TEST_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//sdk/test/metrics:attributes_hashmap_test -//opentracing-shim/...
+  bazel $BAZEL_STARTUP_OPTIONS build --copt=-fno-exceptions $BAZEL_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//opentracing-shim/...
+  bazel $BAZEL_STARTUP_OPTIONS test --copt=-fno-exceptions $BAZEL_TEST_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//opentracing-shim/...
   exit 0
 elif [[ "$1" == "bazel.nortti" ]]; then
   # there are some exceptions and error handling code from the Prometheus Client
diff --git a/sdk/test/metrics/BUILD b/sdk/test/metrics/BUILD
index 3cf379494d..70d0cc063a 100644
--- a/sdk/test/metrics/BUILD
+++ b/sdk/test/metrics/BUILD
@@ -19,307 +19,8 @@ cc_library(
 )
 
 cc_test(
-    name = "meter_test",
-    srcs = [
-        "meter_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "meter_provider_sdk_test",
-    srcs = [
-        "meter_provider_sdk_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "metric_reader_test",
-    srcs = [
-        "metric_reader_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "histogram_test",
-    srcs = [
-        "histogram_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "view_registry_test",
-    srcs = [
-        "view_registry_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "aggregation_test",
-    srcs = [
-        "aggregation_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "sync_metric_storage_counter_test",
-    srcs = [
-        "sync_metric_storage_counter_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "sync_metric_storage_up_down_counter_test",
-    srcs = [
-        "sync_metric_storage_up_down_counter_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "sync_metric_storage_histogram_test",
-    srcs = [
-        "sync_metric_storage_histogram_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "sync_instruments_test",
-    srcs = [
-        "sync_instruments_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "async_instruments_test",
-    srcs = [
-        "async_instruments_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "async_metric_storage_test",
-    srcs = [
-        "async_metric_storage_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "observer_result_test",
-    srcs = [
-        "observer_result_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "multi_metric_storage_test",
-    srcs = [
-        "multi_metric_storage_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "attributes_processor_test",
-    srcs = [
-        "attributes_processor_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "attributes_hashmap_test",
-    srcs = [
-        "attributes_hashmap_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "circular_buffer_counter_test",
-    srcs = [
-        "circular_buffer_counter_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "base2_exponential_histogram_indexer_test",
-    srcs = [
-        "base2_exponential_histogram_indexer_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "histogram_aggregation_test",
-    srcs = [
-        "histogram_aggregation_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "sum_aggregation_test",
-    srcs = [
-        "sum_aggregation_test.cc",
-    ],
+    name = "all_tests",
+    srcs = glob(["*_test.cc"]),
     tags = [
         "metrics",
         "test",
diff --git a/sdk/test/metrics/async_instruments_test.cc b/sdk/test/metrics/async_instruments_test.cc
index b7ad885bbd..01a421e046 100644
--- a/sdk/test/metrics/async_instruments_test.cc
+++ b/sdk/test/metrics/async_instruments_test.cc
@@ -12,10 +12,13 @@ using namespace opentelemetry::sdk::metrics;
 
 using M = std::map<std::string, std::string>;
 
+namespace
+{
 // NOLINTNEXTLINE
 void asyc_generate_measurements(opentelemetry::metrics::ObserverResult /* observer */,
                                 void * /* state */)
 {}
+}  // namespace
 
 TEST(AsyncInstruments, ObservableInstrument)
 {
diff --git a/sdk/test/metrics/attributes_hashmap_test.cc b/sdk/test/metrics/attributes_hashmap_test.cc
index 9ae8f5cfd5..7d77e6166a 100644
--- a/sdk/test/metrics/attributes_hashmap_test.cc
+++ b/sdk/test/metrics/attributes_hashmap_test.cc
@@ -26,14 +26,14 @@ TEST(AttributesHashMap, BasicTests)
   std::unique_ptr<Aggregation> aggregation1(
       new DropAggregation());  //  = std::unique_ptr<Aggregation>(new DropAggregation);
   hash_map.Set(m1, std::move(aggregation1), hash);
-  EXPECT_NO_THROW(hash_map.Get(hash)->Aggregate(static_cast<int64_t>(1)));
+  hash_map.Get(hash)->Aggregate(static_cast<int64_t>(1));
   EXPECT_EQ(hash_map.Size(), 1);
   EXPECT_EQ(hash_map.Has(hash), true);
 
   // Set same key again
   auto aggregation2 = std::unique_ptr<Aggregation>(new DropAggregation());
   hash_map.Set(m1, std::move(aggregation2), hash);
-  EXPECT_NO_THROW(hash_map.Get(hash)->Aggregate(static_cast<int64_t>(1)));
+  hash_map.Get(hash)->Aggregate(static_cast<int64_t>(1));
   EXPECT_EQ(hash_map.Size(), 1);
   EXPECT_EQ(hash_map.Has(hash), true);
 
@@ -44,7 +44,7 @@ TEST(AttributesHashMap, BasicTests)
   hash_map.Set(m3, std::move(aggregation3), hash3);
   EXPECT_EQ(hash_map.Has(hash), true);
   EXPECT_EQ(hash_map.Has(hash3), true);
-  EXPECT_NO_THROW(hash_map.Get(hash3)->Aggregate(static_cast<int64_t>(1)));
+  hash_map.Get(hash3)->Aggregate(static_cast<int64_t>(1));
   EXPECT_EQ(hash_map.Size(), 2);
 
   // GetOrSetDefault
@@ -54,8 +54,8 @@ TEST(AttributesHashMap, BasicTests)
   };
   MetricAttributes m4 = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
   auto hash4          = opentelemetry::sdk::common::GetHashForAttributeMap(m4);
-  EXPECT_NO_THROW(hash_map.GetOrSetDefault(m4, create_default_aggregation, hash4)
-                      ->Aggregate(static_cast<int64_t>(1)));
+  hash_map.GetOrSetDefault(m4, create_default_aggregation, hash4)
+      ->Aggregate(static_cast<int64_t>(1));
   EXPECT_EQ(hash_map.Size(), 3);
 
   // Set attributes with different order - shouldn't create a new entry.
diff --git a/sdk/test/metrics/meter_test.cc b/sdk/test/metrics/meter_test.cc
index b5ed86f55a..cd66737465 100644
--- a/sdk/test/metrics/meter_test.cc
+++ b/sdk/test/metrics/meter_test.cc
@@ -28,7 +28,6 @@ nostd::shared_ptr<metrics::Meter> InitMeter(MetricReader **metricReaderPtr,
   auto meter = provider->GetMeter(meter_name);
   return meter;
 }
-}  // namespace
 
 void asyc_generate_measurements(opentelemetry::metrics::ObserverResult observer, void * /* state */)
 {
@@ -36,6 +35,7 @@ void asyc_generate_measurements(opentelemetry::metrics::ObserverResult observer,
       nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<int64_t>>>(observer);
   observer_long->Observe(10);
 }
+}  // namespace
 
 TEST(MeterTest, BasicAsyncTests)
 {