diff --git a/pxr/imaging/hd/testenv/testHdSortedIds.cpp b/pxr/imaging/hd/testenv/testHdSortedIds.cpp
index 469df5adf4..8dce72a3e0 100644
--- a/pxr/imaging/hd/testenv/testHdSortedIds.cpp
+++ b/pxr/imaging/hd/testenv/testHdSortedIds.cpp
@@ -46,8 +46,8 @@ _InitPaths()
     }
 
     // Shuffle paths randomly.
-    const size_t seed =
-        std::chrono::system_clock::now().time_since_epoch().count();
+    const std::mt19937::result_type seed =
+        static_cast<std::mt19937::result_type>(std::chrono::system_clock::now().time_since_epoch().count());
     std::cout << "Random seed: " << seed << "\n";
     std::mt19937 randomGen(seed);
 
@@ -371,7 +371,7 @@ bool
 InsertRemoveDupesTest()
 {
     std::cout << "\n\nInsertRemoveDupesTest():\n";
-    
+
     using P = SdfPath;
     Hd_SortedIds sortedIds;
     SdfPathVector expected;
@@ -381,7 +381,7 @@ InsertRemoveDupesTest()
 
     expected = {P("/A"),P("/B")};
     TF_AXIOM(sortedIds.GetIds() == expected);
-    
+
     sortedIds.Insert(P("/B"));
     sortedIds.Insert(P("/A"));
     sortedIds.Insert(P("/B"));
diff --git a/pxr/imaging/hd/testenv/testHdSortedIdsPerf.cpp b/pxr/imaging/hd/testenv/testHdSortedIdsPerf.cpp
index 92dd59ae3a..69cca250d0 100644
--- a/pxr/imaging/hd/testenv/testHdSortedIdsPerf.cpp
+++ b/pxr/imaging/hd/testenv/testHdSortedIdsPerf.cpp
@@ -27,9 +27,9 @@ _GetInitPaths()
 {
     static SdfPathVector theInitPaths = []() {
         SdfPathVector paths;
-        
+
         char primName[] = "/_/_/_/_";
-        
+
         for (size_t firstLevel = 0; firstLevel < numFirstLevel; ++firstLevel) {
             primName[1] = firstLevelChar[firstLevel];
             for (char secondLevel = 'A'; secondLevel <= 'Z'; ++secondLevel) {
@@ -44,12 +44,12 @@ _GetInitPaths()
             }
         }
         // Shuffle paths randomly.
-        const size_t seed = 5109223000;
+        const std::mt19937::result_type seed = static_cast<std::mt19937::result_type>(5109223000);
         std::mt19937 randomGen(seed);
         std::shuffle(paths.begin(), paths.end(), randomGen);
 
         printf("Using %zu initial paths\n", paths.size());
-        
+
         return paths;
     }();
 
@@ -146,7 +146,7 @@ MultiRemoveInsertTest(Metrics &metrics)
         }
         ids.GetIds(); // force sort.
     });
-    
+
     metrics.emplace_back("add_del_multiple", ArchTicksToNanoseconds(ticks));
 }
 
@@ -180,7 +180,7 @@ SubtreeRemoveInsertTest(Metrics &metrics)
     Hd_SortedIds ids = _GetPopulatedIds();
 
     std::vector<int64_t> timings;
-    
+
     for (SdfPathVector const &subtreePaths: subtreePathVecs) {
         timings.push_back(
             ArchMeasureExecutionTime([&ids, &subtreePaths]() {
@@ -232,7 +232,7 @@ PartialSubtreeRemoveInsertTest(Metrics &metrics)
     Hd_SortedIds ids = _GetPopulatedIds();
 
     std::vector<int64_t> timings;
-    
+
     for (SdfPathVector const &subtreePaths: subtreePathVecs) {
         timings.push_back(
             ArchMeasureExecutionTime([&ids, &subtreePaths]() {
@@ -300,7 +300,7 @@ SpreadRemoveInsertTest(Metrics &metrics, size_t numElts)
         size_t idx = (ids.GetIds().size() * (x+1)) / (numElts+1);
         paths.push_back(ids.GetIds()[idx]);
     }
-        
+
     int64_t ticks = ArchMeasureExecutionTime([&ids, &paths]() {
         for (SdfPath const &path: paths) {
             ids.Remove(path);
@@ -357,7 +357,7 @@ SubtreeRenameTest(Metrics &metrics,
 int main()
 {
     Metrics metrics;
-    
+
     PopulateTest(metrics);
     SingleRemoveInsertTest(metrics);
     MultiRemoveInsertTest(metrics);
@@ -380,7 +380,7 @@ int main()
     SubtreeRenameTest(metrics, SdfPath("/A/B/C"), SdfPath("/A/B/_C"));
     SubtreeRenameTest(metrics, SdfPath("/A/B"), SdfPath("/A/_B"));
     SubtreeRenameTest(metrics, SdfPath("/Z/Z"), SdfPath("/A/B/_Z"));
-    
+
     FILE *statsFile = fopen("perfstats.raw", "w");
     for (const auto &[metricName, ns]: metrics) {
         fprintf(statsFile,
@@ -389,6 +389,6 @@ int main()
         printf("%s : %zd ns\n", metricName.c_str(), ns);
     }
     fclose(statsFile);
-    
+
     printf("OK\n");
 }