diff --git a/src/back/spv/writer.rs b/src/back/spv/writer.rs
index 3757f8fdd6..ccbcffda57 100644
--- a/src/back/spv/writer.rs
+++ b/src/back/spv/writer.rs
@@ -883,10 +883,24 @@ impl Writer {
         output: &mut Vec<Instruction>,
     ) -> Instruction {
         match statement {
-            crate::Statement::Return { value: _ } => match function.return_type {
-                Some(_) => unimplemented!(),
-                None => Instruction::new(Op::Return),
-            },
+            crate::Statement::Return { value } => {
+                match function.return_type {
+                    Some(_) => {
+                        let value = value.unwrap();
+
+                        // Parse the expression
+                        let value_expression = &function.expressions[value];
+                        let (value_id, _) =
+                            self.parse_expression(ir_module, function, value_expression, output);
+
+                        // Construct the return value instruction
+                        let mut instruction = Instruction::new(Op::ReturnValue);
+                        instruction.add_operand(value_id);
+                        instruction
+                    }
+                    None => Instruction::new(Op::Return),
+                }
+            }
             crate::Statement::Store { pointer, value } => {
                 let mut instruction = Instruction::new(Op::Store);
 
diff --git a/tests/convert.rs b/tests/convert.rs
index 85bb15d7a2..1048b6a618 100644
--- a/tests/convert.rs
+++ b/tests/convert.rs
@@ -1,12 +1,25 @@
+#[cfg(feature = "glsl")]
+use spirv::ExecutionModel;
+
+fn load_test_data(name: &str) -> String {
+    let path = format!("{}/test-data/{}", env!("CARGO_MANIFEST_DIR"), name);
+    std::fs::read_to_string(path).unwrap()
+}
+
 fn load_wgsl(name: &str) -> naga::Module {
-    let path = format!("{}/test-data/{}.wgsl", env!("CARGO_MANIFEST_DIR"), name);
-    let input = std::fs::read_to_string(path).unwrap();
+    let input = load_test_data(name);
     naga::front::wgsl::parse_str(&input).unwrap()
 }
 
+#[cfg(feature = "glsl")]
+fn load_glsl(name: &str, entry: &str, exec: ExecutionModel) -> naga::Module {
+    let input = load_test_data(name);
+    naga::front::glsl::parse_str(&input, entry.to_owned(), exec).unwrap()
+}
+
 #[test]
 fn convert_quad() {
-    let module = load_wgsl("quad");
+    let module = load_wgsl("quad.wgsl");
     {
         use naga::back::msl;
         let mut binding_map = msl::BindingMap::default();
@@ -37,7 +50,7 @@ fn convert_quad() {
 
 #[test]
 fn convert_boids() {
-    let module = load_wgsl("boids");
+    let module = load_wgsl("boids.wgsl");
     {
         use naga::back::msl;
         let mut binding_map = msl::BindingMap::default();
@@ -74,3 +87,18 @@ fn convert_boids() {
         msl::write_string(&module, options).unwrap();
     }
 }
+
+#[cfg(feature = "glsl")]
+#[test]
+#[ignore]
+fn convert_phong_lighting() {
+    let module = load_glsl("glsl_phong_lighting.frag", "main", ExecutionModel::Fragment);
+
+    let header = naga::Header {
+        version: (1, 0, 0),
+        generator: 1234,
+    };
+    let writer_flags = naga::back::spv::WriterFlags::empty();
+    let mut w = naga::back::spv::Writer::new(&header, writer_flags);
+    w.write(&module);
+}