diff --git a/tests/io/buffered_writer.py b/tests/basics/io_buffered_writer.py
similarity index 100%
rename from tests/io/buffered_writer.py
rename to tests/basics/io_buffered_writer.py
diff --git a/tests/io/buffered_writer.py.exp b/tests/basics/io_buffered_writer.py.exp
similarity index 100%
rename from tests/io/buffered_writer.py.exp
rename to tests/basics/io_buffered_writer.py.exp
diff --git a/tests/io/bytesio_cow.py b/tests/basics/io_bytesio_cow.py
similarity index 100%
rename from tests/io/bytesio_cow.py
rename to tests/basics/io_bytesio_cow.py
diff --git a/tests/io/bytesio_ext.py b/tests/basics/io_bytesio_ext.py
similarity index 100%
rename from tests/io/bytesio_ext.py
rename to tests/basics/io_bytesio_ext.py
diff --git a/tests/io/bytesio_ext2.py b/tests/basics/io_bytesio_ext2.py
similarity index 100%
rename from tests/io/bytesio_ext2.py
rename to tests/basics/io_bytesio_ext2.py
diff --git a/tests/io/bytesio_ext2.py.exp b/tests/basics/io_bytesio_ext2.py.exp
similarity index 100%
rename from tests/io/bytesio_ext2.py.exp
rename to tests/basics/io_bytesio_ext2.py.exp
diff --git a/tests/io/iobase.py b/tests/basics/io_iobase.py
similarity index 100%
rename from tests/io/iobase.py
rename to tests/basics/io_iobase.py
diff --git a/tests/io/stringio1.py b/tests/basics/io_stringio1.py
similarity index 100%
rename from tests/io/stringio1.py
rename to tests/basics/io_stringio1.py
diff --git a/tests/io/stringio_with.py b/tests/basics/io_stringio_with.py
similarity index 100%
rename from tests/io/stringio_with.py
rename to tests/basics/io_stringio_with.py
diff --git a/tests/io/write_ext.py b/tests/basics/io_write_ext.py
similarity index 100%
rename from tests/io/write_ext.py
rename to tests/basics/io_write_ext.py
diff --git a/tests/io/write_ext.py.exp b/tests/basics/io_write_ext.py.exp
similarity index 100%
rename from tests/io/write_ext.py.exp
rename to tests/basics/io_write_ext.py.exp