diff --git a/initialize/user_data_test.go b/initialize/user_data_test.go
index c24d322..c764eb2 100644
--- a/initialize/user_data_test.go
+++ b/initialize/user_data_test.go
@@ -29,3 +29,21 @@ func TestParseHeaderCRLF(t *testing.T) {
 		}
 	}
 }
+
+func TestParseConfigCRLF(t *testing.T) {
+	contents := "#cloud-config\r\nhostname: foo\r\nssh_authorized_keys:\r\n  - foobar\r\n"
+	ud, err := ParseUserData(contents)
+	if err != nil {
+		t.Fatalf("Failed parsing config: %v", err)
+	}
+
+	cfg := ud.(CloudConfig)
+
+	if cfg.Hostname != "foo" {
+		t.Error("Failed parsing hostname from config")
+	}
+
+	if len(cfg.SSHAuthorizedKeys) != 1 {
+		t.Error("Parsed incorrect number of SSH keys")
+	}
+}