diff --git a/eth2/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs
index af815cbe2..22885adfe 100644
--- a/eth2/types/src/beacon_state.rs
+++ b/eth2/types/src/beacon_state.rs
@@ -11,6 +11,8 @@ use serde_derive::Serialize;
 use ssz::{hash, Decodable, DecodeError, Encodable, SszStream, TreeHash};
 use swap_or_not_shuffle::get_permutated_index;
 
+mod tests;
+
 #[derive(Debug, PartialEq)]
 pub enum BeaconStateError {
     EpochOutOfBounds,
@@ -1080,33 +1082,3 @@ impl<T: RngCore> TestRandom<T> for BeaconState {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng};
-    use ssz::ssz_encode;
-
-    #[test]
-    pub fn test_ssz_round_trip() {
-        let mut rng = XorShiftRng::from_seed([42; 16]);
-        let original = BeaconState::random_for_test(&mut rng);
-
-        let bytes = ssz_encode(&original);
-        let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap();
-
-        assert_eq!(original, decoded);
-    }
-
-    #[test]
-    pub fn test_hash_tree_root() {
-        let mut rng = XorShiftRng::from_seed([42; 16]);
-        let original = BeaconState::random_for_test(&mut rng);
-
-        let result = original.hash_tree_root();
-
-        assert_eq!(result.len(), 32);
-        // TODO: Add further tests
-        // https://github.com/sigp/lighthouse/issues/170
-    }
-}
diff --git a/eth2/types/src/beacon_state/tests.rs b/eth2/types/src/beacon_state/tests.rs
new file mode 100644
index 000000000..e069e462e
--- /dev/null
+++ b/eth2/types/src/beacon_state/tests.rs
@@ -0,0 +1,97 @@
+#![cfg(test)]
+
+use super::*;
+use crate::test_utils::{SeedableRng, TestRandom, XorShiftRng};
+use crate::{
+    beacon_state::BeaconStateError, BeaconState, ChainSpec, Deposit, DepositData, DepositInput,
+    Eth1Data, Hash256, Keypair,
+};
+use bls::create_proof_of_possession;
+use ssz::ssz_encode;
+
+struct BeaconStateTestBuilder {
+    pub genesis_time: u64,
+    pub initial_validator_deposits: Vec<Deposit>,
+    pub latest_eth1_data: Eth1Data,
+    pub spec: ChainSpec,
+    pub keypairs: Vec<Keypair>,
+}
+
+impl BeaconStateTestBuilder {
+    pub fn with_random_validators(validator_count: usize) -> Self {
+        let genesis_time = 10_000_000;
+        let keypairs: Vec<Keypair> = (0..validator_count)
+            .collect::<Vec<usize>>()
+            .iter()
+            .map(|_| Keypair::random())
+            .collect();
+        let initial_validator_deposits = keypairs
+            .iter()
+            .map(|keypair| Deposit {
+                branch: vec![], // branch verification is not specified.
+                index: 0,       // index verification is not specified.
+                deposit_data: DepositData {
+                    amount: 32_000_000_000, // 32 ETH (in Gwei)
+                    timestamp: genesis_time - 1,
+                    deposit_input: DepositInput {
+                        pubkey: keypair.pk.clone(),
+                        withdrawal_credentials: Hash256::zero(), // Withdrawal not possible.
+                        proof_of_possession: create_proof_of_possession(&keypair),
+                    },
+                },
+            })
+            .collect();
+        let latest_eth1_data = Eth1Data {
+            deposit_root: Hash256::zero(),
+            block_hash: Hash256::zero(),
+        };
+        let spec = ChainSpec::foundation();
+
+        Self {
+            genesis_time,
+            initial_validator_deposits,
+            latest_eth1_data,
+            spec,
+            keypairs,
+        }
+    }
+
+    pub fn build(&self) -> Result<BeaconState, BeaconStateError> {
+        BeaconState::genesis(
+            self.genesis_time,
+            self.initial_validator_deposits.clone(),
+            self.latest_eth1_data.clone(),
+            &self.spec,
+        )
+    }
+}
+
+#[test]
+pub fn can_produce_genesis_block() {
+    let builder = BeaconStateTestBuilder::with_random_validators(2);
+
+    builder.build().unwrap();
+}
+
+#[test]
+pub fn test_ssz_round_trip() {
+    let mut rng = XorShiftRng::from_seed([42; 16]);
+    let original = BeaconState::random_for_test(&mut rng);
+
+    let bytes = ssz_encode(&original);
+    let (decoded, _) = <_>::ssz_decode(&bytes, 0).unwrap();
+
+    assert_eq!(original, decoded);
+}
+
+#[test]
+pub fn test_hash_tree_root() {
+    let mut rng = XorShiftRng::from_seed([42; 16]);
+    let original = BeaconState::random_for_test(&mut rng);
+
+    let result = original.hash_tree_root();
+
+    assert_eq!(result.len(), 32);
+    // TODO: Add further tests
+    // https://github.com/sigp/lighthouse/issues/170
+}
diff --git a/eth2/types/src/beacon_state_tests.rs b/eth2/types/src/beacon_state_tests.rs
deleted file mode 100644
index cae815f33..000000000
--- a/eth2/types/src/beacon_state_tests.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-#[cfg(test)]
-mod tests {
-    use crate::{
-        beacon_state::BeaconStateError, BeaconState, ChainSpec, Deposit, DepositData, DepositInput,
-        Eth1Data, Hash256, Keypair,
-    };
-    use bls::create_proof_of_possession;
-
-    struct BeaconStateTestBuilder {
-        pub genesis_time: u64,
-        pub initial_validator_deposits: Vec<Deposit>,
-        pub latest_eth1_data: Eth1Data,
-        pub spec: ChainSpec,
-        pub keypairs: Vec<Keypair>,
-    }
-
-    impl BeaconStateTestBuilder {
-        pub fn with_random_validators(validator_count: usize) -> Self {
-            let genesis_time = 10_000_000;
-            let keypairs: Vec<Keypair> = (0..validator_count)
-                .collect::<Vec<usize>>()
-                .iter()
-                .map(|_| Keypair::random())
-                .collect();
-            let initial_validator_deposits = keypairs
-                .iter()
-                .map(|keypair| Deposit {
-                    branch: vec![], // branch verification is not specified.
-                    index: 0,       // index verification is not specified.
-                    deposit_data: DepositData {
-                        amount: 32_000_000_000, // 32 ETH (in Gwei)
-                        timestamp: genesis_time - 1,
-                        deposit_input: DepositInput {
-                            pubkey: keypair.pk.clone(),
-                            withdrawal_credentials: Hash256::zero(), // Withdrawal not possible.
-                            proof_of_possession: create_proof_of_possession(&keypair),
-                        },
-                    },
-                })
-                .collect();
-            let latest_eth1_data = Eth1Data {
-                deposit_root: Hash256::zero(),
-                block_hash: Hash256::zero(),
-            };
-            let spec = ChainSpec::foundation();
-
-            Self {
-                genesis_time,
-                initial_validator_deposits,
-                latest_eth1_data,
-                spec,
-                keypairs,
-            }
-        }
-
-        pub fn build(&self) -> Result<BeaconState, BeaconStateError> {
-            BeaconState::genesis(
-                self.genesis_time,
-                self.initial_validator_deposits.clone(),
-                self.latest_eth1_data.clone(),
-                &self.spec,
-            )
-        }
-    }
-
-    #[test]
-    pub fn can_produce_genesis_block() {
-        let builder = BeaconStateTestBuilder::with_random_validators(2);
-
-        builder.build().unwrap();
-    }
-}
diff --git a/eth2/types/src/lib.rs b/eth2/types/src/lib.rs
index d33c48532..233d1cc3e 100644
--- a/eth2/types/src/lib.rs
+++ b/eth2/types/src/lib.rs
@@ -7,7 +7,6 @@ pub mod attester_slashing;
 pub mod beacon_block;
 pub mod beacon_block_body;
 pub mod beacon_state;
-pub mod beacon_state_tests;
 pub mod casper_slashing;
 pub mod crosslink;
 pub mod deposit;