diff --git a/src/lerobot/policies/__init__.py b/src/lerobot/policies/__init__.py
index 9cb0f6234..dc59b60d3 100644
--- a/src/lerobot/policies/__init__.py
+++ b/src/lerobot/policies/__init__.py
@@ -15,6 +15,8 @@
 from .act.configuration_act import ACTConfig as ACTConfig
 from .diffusion.configuration_diffusion import DiffusionConfig as DiffusionConfig
 from .pi0.configuration_pi0 import PI0Config as PI0Config
+from .pi0_openpi.configuration_pi0openpi import PI0OpenPIConfig as PI0OpenPIConfig
+from .pi05_openpi.configuration_pi05openpi import PI05OpenPIConfig as PI05OpenPIConfig
 from .smolvla.configuration_smolvla import SmolVLAConfig as SmolVLAConfig
 from .tdmpc.configuration_tdmpc import TDMPCConfig as TDMPCConfig
 from .vqbet.configuration_vqbet import VQBeTConfig as VQBeTConfig
diff --git a/src/lerobot/policies/pi05_openpi/__init__.py b/src/lerobot/policies/pi05_openpi/__init__.py
deleted file mode 100644
index 2b438db85..000000000
--- a/src/lerobot/policies/pi05_openpi/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright 2025 Physical Intelligence and The HuggingFace Inc. team. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from .configuration_pi05openpi import PI05OpenPIConfig
-from .modeling_pi05openpi import PI05OpenPIPolicy
-
-__all__ = ["PI05OpenPIConfig", "PI05OpenPIPolicy"]
diff --git a/src/lerobot/policies/pi0_openpi/__init__.py b/src/lerobot/policies/pi0_openpi/__init__.py
deleted file mode 100644
index 12d766633..000000000
--- a/src/lerobot/policies/pi0_openpi/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright 2025 Physical Intelligence and The HuggingFace Inc. team. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from .configuration_pi0openpi import PI0OpenPIConfig
-from .modeling_pi0openpi import PI0OpenPIPolicy
-
-__all__ = ["PI0OpenPIConfig", "PI0OpenPIPolicy"]
diff --git a/tests/datasets/test_datasets.py b/tests/datasets/test_datasets.py
index 5e2996a43..2eca82346 100644
--- a/tests/datasets/test_datasets.py
+++ b/tests/datasets/test_datasets.py
@@ -25,9 +25,6 @@ from huggingface_hub import HfApi
 from PIL import Image
 from safetensors.torch import load_file
 
-# Skip entire module if transformers is not available (required by policy factory imports)
-pytest.importorskip("transformers")
-
 import lerobot
 from lerobot.configs.default import DatasetConfig
 from lerobot.configs.train import TrainPipelineConfig
diff --git a/tests/policies/test_pi0_original_vs_lerobot.py b/tests/policies/test_pi0_original_vs_lerobot.py
index e4e7c129d..b5fab6164 100644
--- a/tests/policies/test_pi0_original_vs_lerobot.py
+++ b/tests/policies/test_pi0_original_vs_lerobot.py
@@ -5,8 +5,9 @@ import os
 import pytest
 import torch
 
-# Skip entire module if openpi is not available
+# Skip entire module if openpi or transformers is not available
 pytest.importorskip("openpi")
+pytest.importorskip("transformers")
 
 from openpi.models_pytorch import preprocessing_pytorch as openpi_preprocessing