diff --git a/zebra-chain/src/sapling.rs b/zebra-chain/src/sapling.rs
index b16f44f3..a1f59404 100644
--- a/zebra-chain/src/sapling.rs
+++ b/zebra-chain/src/sapling.rs
@@ -2,21 +2,20 @@
 
 mod address;
 mod commitment;
+mod note;
 mod output;
 mod spend;
-
-pub use output::Output;
-pub use spend::Spend;
+#[cfg(test)]
+mod tests;
 
 // XXX clean up these modules
 
 pub mod keys;
-pub mod note;
 pub mod tree;
 
-#[cfg(test)]
-mod tests;
-
 pub use address::Address;
 pub use commitment::{CommitmentRandomness, NoteCommitment, ValueCommitment};
 pub use keys::Diversifier;
+pub use note::{EncryptedNote, Note, Nullifier, WrappedNoteKey};
+pub use output::Output;
+pub use spend::Spend;
diff --git a/zebra-chain/src/sprout.rs b/zebra-chain/src/sprout.rs
index 5840a411..ef4941fa 100644
--- a/zebra-chain/src/sprout.rs
+++ b/zebra-chain/src/sprout.rs
@@ -1,7 +1,8 @@
 //! Sprout-related functionality.
 
 mod joinsplit;
-pub use joinsplit::JoinSplit;
+#[cfg(test)]
+mod tests;
 
 // XXX clean up these modules
 
@@ -11,5 +12,5 @@ pub mod keys;
 pub mod note;
 pub mod tree;
 
-#[cfg(test)]
-mod tests;
+pub use joinsplit::JoinSplit;
+pub use note::{EncryptedNote, Note, Nullifier};