diff --git a/Cargo.toml b/Cargo.toml
index 22686c5be..ddd29c71a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,8 +80,8 @@ matrixmultiply-threading = ["matrixmultiply/threading"]
 debug = true
 
 [workspace]
-members = ["ndarray-rand", "serialization-tests", "blas-tests"]
-exclude = ["numeric-tests"]
+members = ["ndarray-rand", "xtest-serialization", "xtest-blas"]
+exclude = ["xtest-numeric"]
 
 [package.metadata.release]
 no-dev-version = true
diff --git a/docgen/images/axis_iter.svg b/misc/axis_iter.svg
similarity index 100%
rename from docgen/images/axis_iter.svg
rename to misc/axis_iter.svg
diff --git a/docgen/images/split_at.svg b/misc/split_at.svg
similarity index 100%
rename from docgen/images/split_at.svg
rename to misc/split_at.svg
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index 61dfc56dc..a9cd3e758 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -14,8 +14,8 @@ cargo build --verbose --features "$FEATURES"
 cargo test --verbose --features "$FEATURES"
 cargo test --manifest-path=ndarray-rand/Cargo.toml --no-default-features --verbose
 cargo test --manifest-path=ndarray-rand/Cargo.toml --features quickcheck --verbose
-cargo test --manifest-path=serialization-tests/Cargo.toml --verbose
-cargo test --manifest-path=blas-tests/Cargo.toml --verbose
+cargo test --manifest-path=xtest-serialization/Cargo.toml --verbose
+cargo test --manifest-path=xtest-blas/Cargo.toml --verbose
 cargo test --examples
-CARGO_TARGET_DIR=target/ cargo test --manifest-path=numeric-tests/Cargo.toml --verbose
+CARGO_TARGET_DIR=target/ cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose
 ([ "$CHANNEL" != "nightly" ] || cargo bench --no-run --verbose --features "$FEATURES")
diff --git a/scripts/cross-tests.sh b/scripts/cross-tests.sh
index d9bc8347e..7c4f13111 100755
--- a/scripts/cross-tests.sh
+++ b/scripts/cross-tests.sh
@@ -10,5 +10,5 @@ TARGET=$3
 cross build -v --features="$FEATURES" --target=$TARGET
 cross test -v --no-fail-fast --features="$FEATURES" --target=$TARGET
 cross test -v --no-fail-fast --target=$TARGET --manifest-path=ndarray-rand/Cargo.toml --features quickcheck
-cross test -v --no-fail-fast --target=$TARGET --manifest-path=serialization-tests/Cargo.toml --verbose
-CARGO_TARGET_DIR=target/ cross test -v --no-fail-fast --target=$TARGET --manifest-path=numeric-tests/Cargo.toml
+cross test -v --no-fail-fast --target=$TARGET --manifest-path=xtest-serialization/Cargo.toml --verbose
+CARGO_TARGET_DIR=target/ cross test -v --no-fail-fast --target=$TARGET --manifest-path=xtest-numeric/Cargo.toml
diff --git a/blas-tests/Cargo.toml b/xtest-blas/Cargo.toml
similarity index 100%
rename from blas-tests/Cargo.toml
rename to xtest-blas/Cargo.toml
diff --git a/blas-tests/src/lib.rs b/xtest-blas/src/lib.rs
similarity index 100%
rename from blas-tests/src/lib.rs
rename to xtest-blas/src/lib.rs
diff --git a/blas-tests/tests/oper.rs b/xtest-blas/tests/oper.rs
similarity index 100%
rename from blas-tests/tests/oper.rs
rename to xtest-blas/tests/oper.rs
diff --git a/numeric-tests/Cargo.toml b/xtest-numeric/Cargo.toml
similarity index 100%
rename from numeric-tests/Cargo.toml
rename to xtest-numeric/Cargo.toml
diff --git a/numeric-tests/src/lib.rs b/xtest-numeric/src/lib.rs
similarity index 100%
rename from numeric-tests/src/lib.rs
rename to xtest-numeric/src/lib.rs
diff --git a/numeric-tests/tests/accuracy.rs b/xtest-numeric/tests/accuracy.rs
similarity index 100%
rename from numeric-tests/tests/accuracy.rs
rename to xtest-numeric/tests/accuracy.rs
diff --git a/serialization-tests/Cargo.toml b/xtest-serialization/Cargo.toml
similarity index 100%
rename from serialization-tests/Cargo.toml
rename to xtest-serialization/Cargo.toml
diff --git a/serialization-tests/src/lib.rs b/xtest-serialization/src/lib.rs
similarity index 100%
rename from serialization-tests/src/lib.rs
rename to xtest-serialization/src/lib.rs
diff --git a/serialization-tests/tests/serialize.rs b/xtest-serialization/tests/serialize.rs
similarity index 100%
rename from serialization-tests/tests/serialize.rs
rename to xtest-serialization/tests/serialize.rs