diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07a1f7834..62e2f8bb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
       - Can be used to perform logic that depends on all events being processed (e.g. an iteration of a game loop).
     - `LoopDestroyed` is emitted when the `run` or `run_return` method is about to exit.
 - Rename `MonitorId` to `MonitorHandle`.
+- Removed `serde` implementations from `ControlFlow`.
 
 # Version 0.18.0 (2018-11-07)
 
diff --git a/src/event_loop.rs b/src/event_loop.rs
index efd14aea6..b23c4a39b 100644
--- a/src/event_loop.rs
+++ b/src/event_loop.rs
@@ -53,7 +53,6 @@ impl<T> std::fmt::Debug for EventLoop<T> {
 ///
 /// [events_cleared]: ../event/enum.Event.html#variant.EventsCleared
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum ControlFlow {
     /// When the current loop iteration finishes, immediately begin a new iteration regardless of
     /// whether or not new events are available to process.
diff --git a/tests/serde_objects.rs b/tests/serde_objects.rs
index b5a49631b..5effbbda0 100644
--- a/tests/serde_objects.rs
+++ b/tests/serde_objects.rs
@@ -3,8 +3,8 @@
 extern crate serde;
 extern crate winit;
 
-use winit::{ControlFlow, MouseCursor};
-use winit::{
+use winit::window::{MouseCursor};
+use winit::event::{
     KeyboardInput, TouchPhase, ElementState, MouseButton, MouseScrollDelta, VirtualKeyCode,
     ModifiersState
 };
@@ -14,8 +14,7 @@ use serde::{Serialize, Deserialize};
 fn needs_serde<S: Serialize + Deserialize<'static>>() {}
 
 #[test]
-fn root_serde() {
-    needs_serde::<ControlFlow>();
+fn window_serde() {
     needs_serde::<MouseCursor>();
 }