diff --git a/httpbin/core.py b/httpbin/core.py
index e268f31e..b56f2eed 100644
--- a/httpbin/core.py
+++ b/httpbin/core.py
@@ -633,7 +633,9 @@ def etag(etag):
 
     if if_none_match:
         if etag in if_none_match or '*' in if_none_match:
-            return status_code(304)
+            response = status_code(304)
+            response.headers['ETag'] = etag
+            return response
     elif if_match:
         if etag not in if_match and '*' not in if_match:
             return status_code(412)
diff --git a/test_httpbin.py b/test_httpbin.py
index f2eb4607..4595401b 100755
--- a/test_httpbin.py
+++ b/test_httpbin.py
@@ -685,6 +685,7 @@ def test_etag_if_none_match_matches(self):
             headers={ 'If-None-Match': 'abc' }
         )
         self.assertEqual(response.status_code, 304)
+        self.assertEqual(response.headers.get('ETag'), 'abc')
 
     def test_etag_if_none_match_matches_list(self):
         response = self.app.get(
@@ -692,6 +693,7 @@ def test_etag_if_none_match_matches_list(self):
             headers={ 'If-None-Match': '"123", "abc"' }
         )
         self.assertEqual(response.status_code, 304)
+        self.assertEqual(response.headers.get('ETag'), 'abc')
 
     def test_etag_if_none_match_matches_star(self):
         response = self.app.get(
@@ -699,6 +701,7 @@ def test_etag_if_none_match_matches_star(self):
             headers={ 'If-None-Match': '*' }
         )
         self.assertEqual(response.status_code, 304)
+        self.assertEqual(response.headers.get('ETag'), 'abc')
 
     def test_etag_if_none_match_w_prefix(self):
         response = self.app.get(
@@ -706,6 +709,7 @@ def test_etag_if_none_match_w_prefix(self):
             headers={ 'If-None-Match': 'W/"xyzzy", W/"r2d2xxxx", W/"c3piozzzz"' }
         )
         self.assertEqual(response.status_code, 304)
+        self.assertEqual(response.headers.get('ETag'), 'c3piozzzz')
 
     def test_etag_if_none_match_has_no_match(self):
         response = self.app.get(
@@ -713,6 +717,7 @@ def test_etag_if_none_match_has_no_match(self):
             headers={ 'If-None-Match': '123' }
         )
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers.get('ETag'), 'abc')
 
     def test_etag_if_match_matches(self):
         response = self.app.get(
@@ -720,6 +725,7 @@ def test_etag_if_match_matches(self):
             headers={ 'If-Match': 'abc' }
         )
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers.get('ETag'), 'abc')
 
     def test_etag_if_match_matches_list(self):
         response = self.app.get(
@@ -727,6 +733,7 @@ def test_etag_if_match_matches_list(self):
             headers={ 'If-Match': '"123", "abc"' }
         )
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers.get('ETag'), 'abc')
 
     def test_etag_if_match_matches_star(self):
         response = self.app.get(
@@ -734,6 +741,7 @@ def test_etag_if_match_matches_star(self):
             headers={ 'If-Match': '*' }
         )
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers.get('ETag'), 'abc')
 
     def test_etag_if_match_has_no_match(self):
         response = self.app.get(
@@ -741,6 +749,7 @@ def test_etag_if_match_has_no_match(self):
             headers={ 'If-Match': '123' }
         )
         self.assertEqual(response.status_code, 412)
+        self.assertNotIn('ETag', response.headers)
 
     def test_etag_with_no_headers(self):
         response = self.app.get(