diff --git a/artiq/gateware/rtio/channel.py b/artiq/gateware/rtio/channel.py
index 5e85a1add..d7b9a60e4 100644
--- a/artiq/gateware/rtio/channel.py
+++ b/artiq/gateware/rtio/channel.py
@@ -17,7 +17,7 @@ class Channel:
         if ofifo_depth is None:
             ofifo_depth = 64
         else:
-            warnings.warn("ofifo_depth is deprecated", DeprecationWarning)
+            warnings.warn("ofifo_depth is deprecated", FutureWarning)
         self.ofifo_depth = ofifo_depth
         self.ififo_depth = ififo_depth
 
diff --git a/artiq/language/environment.py b/artiq/language/environment.py
index b7db5d54d..5eb4e8d81 100644
--- a/artiq/language/environment.py
+++ b/artiq/language/environment.py
@@ -303,7 +303,7 @@ class HasEnvironment:
         """
         if save is not None:
             warnings.warn("set_dataset save parameter is deprecated, "
-                          "use archive instead", DeprecationWarning)
+                          "use archive instead", FutureWarning)
             archive = save
         self.__dataset_mgr.set(key, value, broadcast, persist, archive)