diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 63332750..e6900b6f 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -13,7 +13,7 @@ dependencies:
 - cuspatial=23.06
 - dask-cuda=23.06
 - dask-cudf=23.06
-- datashader>=0.14,<=0.14.4
+- datashader>=0.15
 - geopandas>=0.11.0
 - holoviews>=1.15.0,<=1.15.4
 - ipython
diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml
index d8001c9f..8686cfea 100644
--- a/conda/recipes/cuxfilter/meta.yaml
+++ b/conda/recipes/cuxfilter/meta.yaml
@@ -28,7 +28,7 @@ requirements:
     - cuspatial ={{ minor_version }}
     - dask-cuda ={{ minor_version }}
     - dask-cudf ={{ minor_version }}
-    - datashader >=0.14,<=0.14.4
+    - datashader >=0.15
     - geopandas >=0.11.0
     - holoviews>=1.15.0,<=1.15.4
     - jupyter-server-proxy
diff --git a/dependencies.yaml b/dependencies.yaml
index 85da7378..d8d88672 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -109,7 +109,7 @@ dependencies:
       - output_types: [conda, requirements]
         packages:
           - bokeh>=2.4.2,<=2.5
-          - datashader>=0.14,<=0.14.4
+          - datashader>=0.15
           - geopandas>=0.11.0
           - holoviews>=1.15.0,<=1.15.4
           - jupyter-server-proxy
diff --git a/python/cuxfilter/tests/assets/test_gpu_histogram.py b/python/cuxfilter/tests/assets/test_gpu_histogram.py
index 60f18bc8..1b7e2422 100644
--- a/python/cuxfilter/tests/assets/test_gpu_histogram.py
+++ b/python/cuxfilter/tests/assets/test_gpu_histogram.py
@@ -152,6 +152,6 @@ def test_aggregated_column_unique():
     bc.min_value = df["key"].min()
 
     assert np.array_equal(
-        gpu_histogram.aggregated_column_unique(bc, df),
+        np.sort(np.array(gpu_histogram.aggregated_column_unique(bc, df))),
         np.array([0, 4, 9, 10, 14, 21, 22, 24, 26, 29, 34, 38, 98, 103, 108]),
     )
diff --git a/python/cuxfilter/tests/charts/core/test_core_graph.py b/python/cuxfilter/tests/charts/core/test_core_graph.py
index e20531f0..ae5a4376 100644
--- a/python/cuxfilter/tests/charts/core/test_core_graph.py
+++ b/python/cuxfilter/tests/charts/core/test_core_graph.py
@@ -128,7 +128,7 @@ def test_box_selection_callback(
         self.result = None
 
         def t_function(data, edges=None, patch_update=False):
-            self.result = data.reset_index(drop=True)
+            self.result = data.sort_values(by="vertex").reset_index(drop=True)
 
         bg.reload_chart = t_function
 
diff --git a/python/cuxfilter/tests/charts/utils.py b/python/cuxfilter/tests/charts/utils.py
index 55d2b788..b1baf405 100644
--- a/python/cuxfilter/tests/charts/utils.py
+++ b/python/cuxfilter/tests/charts/utils.py
@@ -10,8 +10,16 @@ def initialize_df(type, *df_args):
 
 
 def df_equals(df1, df2):
-    df1 = df1.compute() if isinstance(df1, dask_cudf.DataFrame) else df1
-    df2 = df2.compute() if isinstance(df2, dask_cudf.DataFrame) else df2
+    df1 = (
+        df1.compute().reset_index(drop=True)
+        if isinstance(df1, dask_cudf.DataFrame)
+        else df1.reset_index(drop=True)
+    )
+    df2 = (
+        df2.compute().reset_index(drop=True)
+        if isinstance(df2, dask_cudf.DataFrame)
+        else df2.reset_index(drop=True)
+    )
 
     return df1.equals(df2)