diff --git a/build.gradle b/build.gradle
index 8d52aebc6..9bc129a0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
     implementation 'dev.akkinoc.spring.boot:logback-access-spring-boot-starter:4.0.0'
 
diff --git a/src/main/java/roomescape/member/AuthService.java b/src/main/java/roomescape/member/AuthService.java
index eb8870727..01c89655a 100644
--- a/src/main/java/roomescape/member/AuthService.java
+++ b/src/main/java/roomescape/member/AuthService.java
@@ -6,16 +6,16 @@
 @Service
 public class AuthService {
 
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
     private final TokenProvider tokenProvider;
 
-    public AuthService(MemberDao memberDao, TokenProvider tokenProvider) {
-        this.memberDao = memberDao;
+    public AuthService(MemberRepository memberRepository, TokenProvider tokenProvider) {
+        this.memberRepository = memberRepository;
         this.tokenProvider = tokenProvider;
     }
 
     public String login(LoginRequest loginRequest) {
-        Member findMember = memberDao
+        Member findMember = memberRepository
                 .findByEmailAndPassword(loginRequest.getEmail(), loginRequest.getPassword())
                 .orElseThrow(() -> new IllegalArgumentException("Invalid email or password"));
 
@@ -25,7 +25,7 @@ public String login(LoginRequest loginRequest) {
     public Member loginCheck(String token) {
         Long memberId = tokenProvider.parse(token);
 
-        return memberDao.findById(memberId)
+        return memberRepository.findById(memberId)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid token"));
     }
 }
diff --git a/src/main/java/roomescape/member/Member.java b/src/main/java/roomescape/member/Member.java
index f4f9f7515..b0d13aa58 100644
--- a/src/main/java/roomescape/member/Member.java
+++ b/src/main/java/roomescape/member/Member.java
@@ -1,12 +1,24 @@
 package roomescape.member;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+@Entity
 public class Member {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
     private String email;
     private String password;
     private String role;
 
+    public Member() {
+    }
+
     public Member(Long id, String name, String email, String role) {
         this.id = id;
         this.name = name;
diff --git a/src/main/java/roomescape/member/MemberDao.java b/src/main/java/roomescape/member/MemberDao.java
deleted file mode 100644
index 45dce75b1..000000000
--- a/src/main/java/roomescape/member/MemberDao.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package roomescape.member;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-
-import java.util.Optional;
-
-@Repository
-public class MemberDao {
-    private JdbcTemplate jdbcTemplate;
-
-    public MemberDao(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
-    }
-
-    public Member save(Member member) {
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-        jdbcTemplate.update(connection -> {
-            var ps = connection.prepareStatement("INSERT INTO member(name, email, password, role) VALUES (?, ?, ?, ?)", new String[]{"id"});
-            ps.setString(1, member.getName());
-            ps.setString(2, member.getEmail());
-            ps.setString(3, member.getPassword());
-            ps.setString(4, member.getRole());
-            return ps;
-        }, keyHolder);
-
-        return new Member(keyHolder.getKey().longValue(), member.getName(), member.getEmail(), "USER");
-    }
-
-    public Optional<Member> findById(long id) {
-        String sql = "SELECT * FROM member WHERE id = ?";
-        Member member = jdbcTemplate.queryForObject(sql, getMemberRowMapper(), id);
-        return Optional.ofNullable(member);
-    }
-
-    public Optional<Member> findByEmailAndPassword(String email, String password) {
-        Member member = jdbcTemplate.queryForObject(
-                "SELECT id, name, email, role FROM member WHERE email = ? AND password = ?",
-                getMemberRowMapper(),
-                email, password
-        );
-        return Optional.ofNullable(member);
-    }
-
-    public Optional<Member> findByName(String name) {
-        Member member = jdbcTemplate.queryForObject(
-                "SELECT id, name, email, role FROM member WHERE name = ?",
-                getMemberRowMapper(),
-                name
-        );
-        return Optional.ofNullable(member);
-    }
-
-    private RowMapper<Member> getMemberRowMapper() {
-        return (rs, rowNum) -> new Member(
-                rs.getLong("id"),
-                rs.getString("name"),
-                rs.getString("email"),
-                rs.getString("role")
-        );
-    }
-}
diff --git a/src/main/java/roomescape/member/MemberRepository.java b/src/main/java/roomescape/member/MemberRepository.java
new file mode 100644
index 000000000..96577ca62
--- /dev/null
+++ b/src/main/java/roomescape/member/MemberRepository.java
@@ -0,0 +1,10 @@
+package roomescape.member;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface MemberRepository extends JpaRepository<Member, Long> {
+    
+    Optional<Member> findByEmailAndPassword(String email, String password);
+}
diff --git a/src/main/java/roomescape/member/MemberService.java b/src/main/java/roomescape/member/MemberService.java
index e00f8d901..6a822860f 100644
--- a/src/main/java/roomescape/member/MemberService.java
+++ b/src/main/java/roomescape/member/MemberService.java
@@ -5,14 +5,14 @@
 @Service
 public class MemberService {
 
-    private final MemberDao memberDao;
+    private final MemberRepository memberRepository;
 
-    public MemberService(MemberDao memberDao) {
-        this.memberDao = memberDao;
+    public MemberService(MemberRepository memberRepository) {
+        this.memberRepository = memberRepository;
     }
 
     public MemberResponse createMember(MemberRequest memberRequest) {
-        Member member = memberDao.save(new Member(memberRequest.getName(), memberRequest.getEmail(), memberRequest.getPassword(), "USER"));
+        Member member = memberRepository.save(new Member(memberRequest.getName(), memberRequest.getEmail(), memberRequest.getPassword(), "USER"));
         return new MemberResponse(member.getId(), member.getName(), member.getEmail());
     }
 
diff --git a/src/main/java/roomescape/reservation/MyReservationResponse.java b/src/main/java/roomescape/reservation/MyReservationResponse.java
new file mode 100644
index 000000000..ba68404ff
--- /dev/null
+++ b/src/main/java/roomescape/reservation/MyReservationResponse.java
@@ -0,0 +1,38 @@
+package roomescape.reservation;
+
+public class MyReservationResponse {
+    
+    private final Long id;
+    private final String theme;
+    private final String date;
+    private final String time;
+    private final String status;
+
+    public MyReservationResponse(Long id, String theme, String date, String time, String status) {
+        this.id = id;
+        this.theme = theme;
+        this.date = date;
+        this.time = time;
+        this.status = status;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getTheme() {
+        return theme;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+}
diff --git a/src/main/java/roomescape/reservation/Reservation.java b/src/main/java/roomescape/reservation/Reservation.java
index 7a56ac31d..8898f2854 100644
--- a/src/main/java/roomescape/reservation/Reservation.java
+++ b/src/main/java/roomescape/reservation/Reservation.java
@@ -1,36 +1,41 @@
 package roomescape.reservation;
 
+import jakarta.persistence.*;
+import roomescape.member.Member;
 import roomescape.theme.Theme;
 import roomescape.time.Time;
 
+@Entity
 public class Reservation {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
     private String date;
+    
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Member member;
+    
+    @ManyToOne(fetch = FetchType.LAZY)
     private Time time;
-    private Theme theme;
 
-    public Reservation(Long id, String name, String date, Time time, Theme theme) {
-        this.id = id;
-        this.name = name;
-        this.date = date;
-        this.time = time;
-        this.theme = theme;
-    }
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Theme theme;
 
-    public Reservation(String name, String date, Time time, Theme theme) {
+    private Reservation(String name, String date, Member member, Time time, Theme theme) {
         this.name = name;
         this.date = date;
+        this.member = member;
         this.time = time;
         this.theme = theme;
     }
 
     protected Reservation() {
-
     }
 
-    public static Reservation of(String name, String date, Time time, Theme theme) {
-        return new Reservation(name, date, time, theme);
+    public static Reservation of(String name, String date, Member member, Time time, Theme theme) {
+        return new Reservation(name, date, member, time, theme);
     }
 
     public Long getId() {
diff --git a/src/main/java/roomescape/reservation/ReservationController.java b/src/main/java/roomescape/reservation/ReservationController.java
index fa34c82c8..146e87940 100644
--- a/src/main/java/roomescape/reservation/ReservationController.java
+++ b/src/main/java/roomescape/reservation/ReservationController.java
@@ -43,4 +43,10 @@ public ResponseEntity delete(@PathVariable Long id) {
         reservationService.deleteById(id);
         return ResponseEntity.noContent().build();
     }
+    
+    @GetMapping("/reservations-mine")
+    public List<MyReservationResponse> listMine(LoginMember loginMember) {
+        return reservationService.getMyReservationResponses(loginMember.getId());
+    }
+
 }
diff --git a/src/main/java/roomescape/reservation/ReservationDao.java b/src/main/java/roomescape/reservation/ReservationDao.java
deleted file mode 100644
index a4972430c..000000000
--- a/src/main/java/roomescape/reservation/ReservationDao.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package roomescape.reservation;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-import roomescape.theme.Theme;
-import roomescape.time.Time;
-
-import java.sql.PreparedStatement;
-import java.util.List;
-
-@Repository
-public class ReservationDao {
-
-    private final JdbcTemplate jdbcTemplate;
-
-    public ReservationDao(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
-    }
-
-    public List<Reservation> findAll() {
-        return jdbcTemplate.query(
-                "SELECT r.id AS reservation_id, r.name as reservation_name, r.date as reservation_date, " +
-                        "t.id AS theme_id, t.name AS theme_name, t.description AS theme_description, " +
-                        "ti.id AS time_id, ti.time_value AS time_value " +
-                        "FROM reservation r " +
-                        "JOIN theme t ON r.theme_id = t.id " +
-                        "JOIN time ti ON r.time_id = ti.id",
-
-                (rs, rowNum) -> new Reservation(
-                        rs.getLong("reservation_id"),
-                        rs.getString("reservation_name"),
-                        rs.getString("reservation_date"),
-                        new Time(
-                                rs.getLong("time_id"),
-                                rs.getString("time_value")
-                        ),
-                        new Theme(
-                                rs.getLong("theme_id"),
-                                rs.getString("theme_name"),
-                                rs.getString("theme_description")
-                        )));
-    }
-
-    public Reservation save(ReservationRequest reservationRequest) {
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-        jdbcTemplate.update(connection -> {
-            PreparedStatement ps = connection.prepareStatement("INSERT INTO reservation(date, name, theme_id, time_id) VALUES (?, ?, ?, ?)", new String[]{"id"});
-            ps.setString(1, reservationRequest.getDate());
-            ps.setString(2, reservationRequest.getName());
-            ps.setLong(3, reservationRequest.getTheme());
-            ps.setLong(4, reservationRequest.getTime());
-            return ps;
-        }, keyHolder);
-
-        Time time = jdbcTemplate.queryForObject("SELECT * FROM time WHERE id = ?",
-                (rs, rowNum) -> new Time(rs.getLong("id"), rs.getString("time_value")),
-                reservationRequest.getTime());
-
-        Theme theme = jdbcTemplate.queryForObject("SELECT * FROM theme WHERE id = ?",
-                (rs, rowNum) -> new Theme(rs.getLong("id"), rs.getString("name"), rs.getString("description")),
-                reservationRequest.getTheme());
-
-        return new Reservation(
-                keyHolder.getKey().longValue(),
-                reservationRequest.getName(),
-                reservationRequest.getDate(),
-                time,
-                theme
-        );
-    }
-
-    public void deleteById(Long id) {
-        jdbcTemplate.update("DELETE FROM reservation WHERE id = ?", id);
-    }
-
-    public List<Reservation> findReservationsByDateAndTheme(String date, Long themeId) {
-        return jdbcTemplate.query(
-                "SELECT r.id AS reservation_id, r.name as reservation_name, r.date as reservation_date, " +
-                        "t.id AS theme_id, t.name AS theme_name, t.description AS theme_description, " +
-                        "ti.id AS time_id, ti.time_value AS time_value " +
-                        "FROM reservation r " +
-                        "JOIN theme t ON r.theme_id = t.id " +
-                        "JOIN time ti ON r.time_id = ti.id" +
-                        "WHERE r.date = ? AND r.theme_id = ?",
-                new Object[]{date, themeId},
-                (rs, rowNum) -> new Reservation(
-                        rs.getLong("reservation_id"),
-                        rs.getString("reservation_name"),
-                        rs.getString("reservation_date"),
-                        new Time(
-                                rs.getLong("time_id"),
-                                rs.getString("time_value")
-                        ),
-                        new Theme(
-                                rs.getLong("theme_id"),
-                                rs.getString("theme_name"),
-                                rs.getString("theme_description")
-                        )));
-    }
-
-    public List<Reservation> findByDateAndThemeId(String date, Long themeId) {
-        return jdbcTemplate.query(
-                "SELECT r.id AS reservation_id, r.name as reservation_name, r.date as reservation_date, " +
-                        "t.id AS theme_id, t.name AS theme_name, t.description AS theme_description, " +
-                        "ti.id AS time_id, ti.time_value AS time_value " +
-                        "FROM reservation r " +
-                        "JOIN theme t ON r.theme_id = t.id " +
-                        "JOIN time ti ON r.time_id = ti.id " +
-                        "WHERE r.date = ? AND r.theme_id = ?",
-                new Object[]{date, themeId},
-                (rs, rowNum) -> new Reservation(
-                        rs.getLong("reservation_id"),
-                        rs.getString("reservation_name"),
-                        rs.getString("reservation_date"),
-                        new Time(
-                                rs.getLong("time_id"),
-                                rs.getString("time_value")
-                        ),
-                        new Theme(
-                                rs.getLong("theme_id"),
-                                rs.getString("theme_name"),
-                                rs.getString("theme_description")
-                        )));
-    }
-}
diff --git a/src/main/java/roomescape/reservation/ReservationRepository.java b/src/main/java/roomescape/reservation/ReservationRepository.java
new file mode 100644
index 000000000..e396130fe
--- /dev/null
+++ b/src/main/java/roomescape/reservation/ReservationRepository.java
@@ -0,0 +1,12 @@
+package roomescape.reservation;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import roomescape.member.Member;
+
+import java.util.List;
+
+public interface ReservationRepository extends JpaRepository<Reservation, Long> {
+    List<Reservation> findByDateAndThemeId(String date, Long themeId);
+
+    List<Reservation> findAllByMember(Member member);
+}
diff --git a/src/main/java/roomescape/reservation/ReservationService.java b/src/main/java/roomescape/reservation/ReservationService.java
index ab723f09f..c593ecea3 100644
--- a/src/main/java/roomescape/reservation/ReservationService.java
+++ b/src/main/java/roomescape/reservation/ReservationService.java
@@ -2,32 +2,92 @@
 
 import org.springframework.stereotype.Service;
 import roomescape.member.LoginMember;
+import roomescape.member.Member;
+import roomescape.member.MemberRepository;
+import roomescape.theme.Theme;
+import roomescape.theme.ThemeRepository;
+import roomescape.time.Time;
+import roomescape.time.TimeRepository;
+import roomescape.waiting.WaitingRepository;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class ReservationService {
-    private ReservationDao reservationDao;
+    private final ReservationRepository reservationRepository;
+    private final WaitingRepository waitingRepository;
+    private final MemberRepository memberRepository;
+    private final ThemeRepository themeRepository;
+    private final TimeRepository timeRepository;
 
-    public ReservationService(ReservationDao reservationDao) {
-        this.reservationDao = reservationDao;
+    public ReservationService(ReservationRepository reservationRepository, WaitingRepository waitingRepository, MemberRepository memberRepository, ThemeRepository themeRepository, TimeRepository timeRepository) {
+        this.reservationRepository = reservationRepository;
+        this.waitingRepository = waitingRepository;
+        this.memberRepository = memberRepository;
+        this.themeRepository = themeRepository;
+        this.timeRepository = timeRepository;
     }
 
     public ReservationResponse save(ReservationRequest reservationRequest, LoginMember loginMember) {
         reservationRequest = reservationRequest.withUserName(loginMember.getName());
 
-        Reservation reservation = reservationDao.save(reservationRequest);
+        Member member = getMemberBy(loginMember.getId());
 
-        return new ReservationResponse(reservation.getId(), reservationRequest.getName(), reservation.getTheme().getName(), reservation.getDate(), reservation.getTime().getValue());
+        Time time = timeRepository.findById(reservationRequest.getTime())
+                .orElseThrow(() -> new IllegalArgumentException("Invalid time ID"));
+        Theme theme = themeRepository.findById(reservationRequest.getTheme())
+                .orElseThrow(() -> new IllegalArgumentException("Invalid theme ID"));
+
+        Reservation reservation = Reservation.of(
+                reservationRequest.getName(),
+                reservationRequest.getDate(),
+                member,
+                time,
+                theme
+        );
+        reservationRepository.save(reservation);
+
+        return new ReservationResponse(
+                reservation.getId(), 
+                reservationRequest.getName(), 
+                theme.getName(),
+                reservation.getDate(), 
+                time.getTime()
+        );
     }
 
     public void deleteById(Long id) {
-        reservationDao.deleteById(id);
+        reservationRepository.deleteById(id);
     }
 
     public List<ReservationResponse> findAll() {
-        return reservationDao.findAll().stream()
-                .map(it -> new ReservationResponse(it.getId(), it.getName(), it.getTheme().getName(), it.getDate(), it.getTime().getValue()))
+        return reservationRepository.findAll().stream()
+                .map(it -> new ReservationResponse(it.getId(), it.getName(), it.getTheme().getName(), it.getDate(), it.getTime().getTime()))
                 .toList();
     }
+
+    public List<MyReservationResponse> getMyReservationResponses(Long memberId) {
+        Member member = getMemberBy(memberId);
+
+        List<Reservation> reservations = reservationRepository.findAllByMember(member);
+        List<MyReservationResponse> myReservationResponses = new ArrayList<>(reservations.stream()
+                .map(r -> new MyReservationResponse(
+                        r.getId(),
+                        r.getTheme().getName(),
+                        r.getDate(),
+                        r.getTime().getTime(),
+                        "예약"
+                ))
+                .toList());
+
+        List<MyReservationResponse> allByMemberId = waitingRepository.findAllByMemberId(member.getId());
+        myReservationResponses.addAll(allByMemberId);
+        return myReservationResponses;
+    }
+
+    private Member getMemberBy(Long memberId) {
+        return memberRepository.findById(memberId)
+                .orElseThrow(() -> new IllegalArgumentException("Invalid member ID"));
+    }
 }
diff --git a/src/main/java/roomescape/theme/Theme.java b/src/main/java/roomescape/theme/Theme.java
index 430a6239c..55a955b81 100644
--- a/src/main/java/roomescape/theme/Theme.java
+++ b/src/main/java/roomescape/theme/Theme.java
@@ -1,6 +1,16 @@
 package roomescape.theme;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
+import static jakarta.persistence.GenerationType.IDENTITY;
+
+@Entity
 public class Theme {
+    
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
     private Long id;
     private String name;
     private String description;
diff --git a/src/main/java/roomescape/theme/ThemeController.java b/src/main/java/roomescape/theme/ThemeController.java
index 03bca41a6..f336ffe85 100644
--- a/src/main/java/roomescape/theme/ThemeController.java
+++ b/src/main/java/roomescape/theme/ThemeController.java
@@ -13,26 +13,26 @@
 
 @RestController
 public class ThemeController {
-    private ThemeDao themeDao;
+    private ThemeRepository themeRepository;
 
-    public ThemeController(ThemeDao themeDao) {
-        this.themeDao = themeDao;
+    public ThemeController(ThemeRepository themeRepository) {
+        this.themeRepository = themeRepository;
     }
 
     @PostMapping("/themes")
     public ResponseEntity<Theme> createTheme(@RequestBody Theme theme) {
-        Theme newTheme = themeDao.save(theme);
+        Theme newTheme = themeRepository.save(theme);
         return ResponseEntity.created(URI.create("/themes/" + newTheme.getId())).body(newTheme);
     }
 
     @GetMapping("/themes")
     public ResponseEntity<List<Theme>> list() {
-        return ResponseEntity.ok(themeDao.findAll());
+        return ResponseEntity.ok(themeRepository.findAll());
     }
 
     @DeleteMapping("/themes/{id}")
     public ResponseEntity<Void> deleteTheme(@PathVariable Long id) {
-        themeDao.deleteById(id);
+        themeRepository.deleteById(id);
         return ResponseEntity.noContent().build();
     }
 }
diff --git a/src/main/java/roomescape/theme/ThemeDao.java b/src/main/java/roomescape/theme/ThemeDao.java
deleted file mode 100644
index 945341d8d..000000000
--- a/src/main/java/roomescape/theme/ThemeDao.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package roomescape.theme;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public class ThemeDao {
-    private JdbcTemplate jdbcTemplate;
-
-    public ThemeDao(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
-    }
-
-    public List<Theme> findAll() {
-        return jdbcTemplate.query("SELECT * FROM theme where deleted = false", (rs, rowNum) -> new Theme(
-                rs.getLong("id"),
-                rs.getString("name"),
-                rs.getString("description")
-        ));
-    }
-
-    public Theme save(Theme theme) {
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-        jdbcTemplate.update(connection -> {
-            var ps = connection.prepareStatement("INSERT INTO theme(name, description) VALUES (?, ?)", new String[]{"id"});
-            ps.setString(1, theme.getName());
-            ps.setString(2, theme.getDescription());
-            return ps;
-        }, keyHolder);
-
-        return new Theme(keyHolder.getKey().longValue(), theme.getName(), theme.getDescription());
-    }
-
-    public void deleteById(Long id) {
-        jdbcTemplate.update("UPDATE theme SET deleted = true WHERE id = ?", id);
-    }
-}
diff --git a/src/main/java/roomescape/theme/ThemeRepository.java b/src/main/java/roomescape/theme/ThemeRepository.java
new file mode 100644
index 000000000..cbdb21a3d
--- /dev/null
+++ b/src/main/java/roomescape/theme/ThemeRepository.java
@@ -0,0 +1,6 @@
+package roomescape.theme;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ThemeRepository extends JpaRepository<Theme, Long> {
+}
diff --git a/src/main/java/roomescape/time/Time.java b/src/main/java/roomescape/time/Time.java
index 008ed93cf..cc8786324 100644
--- a/src/main/java/roomescape/time/Time.java
+++ b/src/main/java/roomescape/time/Time.java
@@ -1,16 +1,24 @@
 package roomescape.time;
 
+import jakarta.persistence.*;
+
+@Entity
 public class Time {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    private String value;
+    
+    @Column(name = "time_value")
+    private String time;
 
-    public Time(Long id, String value) {
+    public Time(Long id, String time) {
         this.id = id;
-        this.value = value;
+        this.time = time;
     }
 
-    public Time(String value) {
-        this.value = value;
+    public Time(String time) {
+        this.time = time;
     }
 
     public Time() {
@@ -21,7 +29,7 @@ public Long getId() {
         return id;
     }
 
-    public String getValue() {
-        return value;
+    public String getTime() {
+        return time;
     }
 }
diff --git a/src/main/java/roomescape/time/TimeController.java b/src/main/java/roomescape/time/TimeController.java
index 2343114d1..abf631727 100644
--- a/src/main/java/roomescape/time/TimeController.java
+++ b/src/main/java/roomescape/time/TimeController.java
@@ -27,7 +27,7 @@ public List<Time> list() {
 
     @PostMapping("/times")
     public ResponseEntity<Time> create(@RequestBody Time time) {
-        if (time.getValue() == null || time.getValue().isEmpty()) {
+        if (time.getTime() == null || time.getTime().isEmpty()) {
             throw new RuntimeException();
         }
 
@@ -45,4 +45,4 @@ public ResponseEntity<Void> delete(@PathVariable Long id) {
     public ResponseEntity<List<AvailableTime>> availableTimes(@RequestParam String date, @RequestParam Long themeId) {
         return ResponseEntity.ok(timeService.getAvailableTime(date, themeId));
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/roomescape/time/TimeDao.java b/src/main/java/roomescape/time/TimeDao.java
deleted file mode 100644
index f39a9a328..000000000
--- a/src/main/java/roomescape/time/TimeDao.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package roomescape.time;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-
-import java.sql.PreparedStatement;
-import java.util.List;
-
-@Repository
-public class TimeDao {
-    private final JdbcTemplate jdbcTemplate;
-
-    public TimeDao(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
-    }
-
-    public List<Time> findAll() {
-        return jdbcTemplate.query(
-                "SELECT * FROM time WHERE deleted = false",
-                (rs, rowNum) -> new Time(
-                        rs.getLong("id"),
-                        rs.getString("time_value")));
-    }
-
-    public Time save(Time time) {
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-        this.jdbcTemplate.update(connection -> {
-            PreparedStatement ps = connection.prepareStatement("INSERT INTO time(time_value) VALUES (?)", new String[]{"id"});
-            ps.setString(1, time.getValue());
-            return ps;
-        }, keyHolder);
-
-        return new Time(keyHolder.getKey().longValue(), time.getValue());
-    }
-
-    public void deleteById(Long id) {
-        jdbcTemplate.update("UPDATE time SET deleted = true WHERE id = ?", id);
-    }
-}
diff --git a/src/main/java/roomescape/time/TimeRepository.java b/src/main/java/roomescape/time/TimeRepository.java
new file mode 100644
index 000000000..998100641
--- /dev/null
+++ b/src/main/java/roomescape/time/TimeRepository.java
@@ -0,0 +1,6 @@
+package roomescape.time;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TimeRepository extends JpaRepository<Time, Long> {
+}
diff --git a/src/main/java/roomescape/time/TimeService.java b/src/main/java/roomescape/time/TimeService.java
index 7d0cb9b09..e9d386777 100644
--- a/src/main/java/roomescape/time/TimeService.java
+++ b/src/main/java/roomescape/time/TimeService.java
@@ -2,28 +2,28 @@
 
 import org.springframework.stereotype.Service;
 import roomescape.reservation.Reservation;
-import roomescape.reservation.ReservationDao;
+import roomescape.reservation.ReservationRepository;
 
 import java.util.List;
 
 @Service
 public class TimeService {
-    private TimeDao timeDao;
-    private ReservationDao reservationDao;
+    private final TimeRepository timeRepository;
+    private final ReservationRepository reservationRepository;
 
-    public TimeService(TimeDao timeDao, ReservationDao reservationDao) {
-        this.timeDao = timeDao;
-        this.reservationDao = reservationDao;
+    public TimeService(TimeRepository timeRepository, ReservationRepository reservationRepository) {
+        this.timeRepository = timeRepository;
+        this.reservationRepository = reservationRepository;
     }
 
     public List<AvailableTime> getAvailableTime(String date, Long themeId) {
-        List<Reservation> reservations = reservationDao.findByDateAndThemeId(date, themeId);
-        List<Time> times = timeDao.findAll();
+        List<Reservation> reservations = reservationRepository.findByDateAndThemeId(date, themeId);
+        List<Time> times = timeRepository.findAll();
 
         return times.stream()
                 .map(time -> new AvailableTime(
                         time.getId(),
-                        time.getValue(),
+                        time.getTime(),
                         reservations.stream()
                                 .anyMatch(reservation -> reservation.getTime().getId().equals(time.getId()))
                 ))
@@ -31,14 +31,14 @@ public List<AvailableTime> getAvailableTime(String date, Long themeId) {
     }
 
     public List<Time> findAll() {
-        return timeDao.findAll();
+        return timeRepository.findAll();
     }
 
     public Time save(Time time) {
-        return timeDao.save(time);
+        return timeRepository.save(time);
     }
 
     public void deleteById(Long id) {
-        timeDao.deleteById(id);
+        timeRepository.deleteById(id);
     }
 }
diff --git a/src/main/java/roomescape/waiting/MemberId.java b/src/main/java/roomescape/waiting/MemberId.java
new file mode 100644
index 000000000..328afb668
--- /dev/null
+++ b/src/main/java/roomescape/waiting/MemberId.java
@@ -0,0 +1,22 @@
+package roomescape.waiting;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+
+@Embeddable
+public class MemberId {
+
+    @Column(name = "member_id")
+    private Long id;
+
+    protected MemberId() {
+    }
+
+    public MemberId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/src/main/java/roomescape/waiting/ThemeId.java b/src/main/java/roomescape/waiting/ThemeId.java
new file mode 100644
index 000000000..3c075bfff
--- /dev/null
+++ b/src/main/java/roomescape/waiting/ThemeId.java
@@ -0,0 +1,18 @@
+package roomescape.waiting;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+
+@Embeddable
+public class ThemeId {
+
+    @Column(name = "theme_id")
+    private Long id;
+
+    protected ThemeId() {
+    }
+
+    public ThemeId(Long id) {
+        this.id = id;
+    }
+}
diff --git a/src/main/java/roomescape/waiting/TimeId.java b/src/main/java/roomescape/waiting/TimeId.java
new file mode 100644
index 000000000..319b2fe3e
--- /dev/null
+++ b/src/main/java/roomescape/waiting/TimeId.java
@@ -0,0 +1,20 @@
+package roomescape.waiting;
+
+import jakarta.persistence.Column;
+
+public class TimeId {
+
+    @Column(name = "time_id")
+    private Long id;
+
+    protected TimeId() {
+    }
+
+    public TimeId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/src/main/java/roomescape/waiting/Waiting.java b/src/main/java/roomescape/waiting/Waiting.java
new file mode 100644
index 000000000..fb856e295
--- /dev/null
+++ b/src/main/java/roomescape/waiting/Waiting.java
@@ -0,0 +1,43 @@
+package roomescape.waiting;
+
+import jakarta.persistence.*;
+
+import java.time.LocalDate;
+
+@Entity
+public class Waiting {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Embedded
+    @AttributeOverrides(
+            @AttributeOverride(name = "id", column = @Column(name = "member_id"))
+    )
+    private MemberId memberId;
+
+    @Embedded
+    @AttributeOverrides(
+            @AttributeOverride(name = "id", column = @Column(name = "theme_id"))
+    )
+    private ThemeId themeId;
+
+    @Embedded
+    @AttributeOverrides(
+            @AttributeOverride(name = "id", column = @Column(name = "time_id"))
+    )
+    private TimeId timeId;
+
+    private LocalDate date;
+
+    protected Waiting() {
+    }
+
+    public Waiting(MemberId memberId, ThemeId themeId, TimeId timeId, LocalDate date) {
+        this.memberId = memberId;
+        this.themeId = themeId;
+        this.timeId = timeId;
+        this.date = date;
+    }
+}
diff --git a/src/main/java/roomescape/waiting/WaitingAlreadyExistException.java b/src/main/java/roomescape/waiting/WaitingAlreadyExistException.java
new file mode 100644
index 000000000..7c0f74181
--- /dev/null
+++ b/src/main/java/roomescape/waiting/WaitingAlreadyExistException.java
@@ -0,0 +1,4 @@
+package roomescape.waiting;
+
+public class WaitingAlreadyExistException extends RuntimeException {
+}
diff --git a/src/main/java/roomescape/waiting/WaitingController.java b/src/main/java/roomescape/waiting/WaitingController.java
new file mode 100644
index 000000000..120474095
--- /dev/null
+++ b/src/main/java/roomescape/waiting/WaitingController.java
@@ -0,0 +1,39 @@
+package roomescape.waiting;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import roomescape.member.LoginMember;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+@RestController
+public class WaitingController {
+
+    private final WaitingService waitingService;
+
+    public WaitingController(WaitingService waitingService) {
+        this.waitingService = waitingService;
+    }
+
+    @PostMapping("/waitings")
+    public ResponseEntity<WaitingResponse> waiting(LoginMember loginMember, @RequestBody WaitingRequest waitingRequest) throws MalformedURLException, URISyntaxException {
+
+        Long rank = waitingService.create(loginMember.getId(), waitingRequest);
+
+        return ResponseEntity
+                .created(URI.create("/"))
+                .body(new WaitingResponse(rank));
+    }
+
+    @DeleteMapping("/waitings/{waitingId}")
+    public ResponseEntity<WaitingResponse> cancel(LoginMember loginMember, @PathVariable("waitingId") Long waitingId) {
+
+        waitingService.cancel(loginMember.getId(), waitingId);
+
+        return ResponseEntity
+                .noContent()
+                .build();
+    }
+}
diff --git a/src/main/java/roomescape/waiting/WaitingJpaRepository.java b/src/main/java/roomescape/waiting/WaitingJpaRepository.java
new file mode 100644
index 000000000..e59e85b45
--- /dev/null
+++ b/src/main/java/roomescape/waiting/WaitingJpaRepository.java
@@ -0,0 +1,10 @@
+package roomescape.waiting;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface WaitingJpaRepository extends JpaRepository<Waiting, Long> {
+
+    void deleteByMemberIdAndId(MemberId memberId, Long id);
+
+    boolean existsByMemberIdAndThemeIdAndTimeId(MemberId memberId, ThemeId themeId, TimeId timeId);
+}
diff --git a/src/main/java/roomescape/waiting/WaitingRepository.java b/src/main/java/roomescape/waiting/WaitingRepository.java
new file mode 100644
index 000000000..a1784c386
--- /dev/null
+++ b/src/main/java/roomescape/waiting/WaitingRepository.java
@@ -0,0 +1,82 @@
+package roomescape.waiting;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+import roomescape.reservation.MyReservationResponse;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Repository
+public class WaitingRepository {
+
+    private final WaitingJpaRepository waitingJpaRepository;
+    private final JdbcTemplate jdbcTemplate;
+
+    public WaitingRepository(WaitingJpaRepository waitingJpaRepository, JdbcTemplate jdbcTemplate) {
+        this.waitingJpaRepository = waitingJpaRepository;
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public void save(Waiting waiting) {
+        waitingJpaRepository.save(waiting);
+    }
+
+
+    public Long findMyRank(Long memberId, LocalDate date, Long theme, Long time) {
+        String sql = """
+                SELECT *
+                FROM (
+                SELECT
+                  *,
+                  RANK() OVER (PARTITION BY theme_id, time_id, date ORDER BY id) AS rank
+                FROM WAITING
+                WHERE theme_id = ? AND date = ? AND time_id = ?
+                )
+                where member_id = ?;
+                """;
+
+        WaitingWithRank waitingWithRank = jdbcTemplate.queryForObject(sql, (rs, rowNum) -> new WaitingWithRank(
+                new Waiting(
+                        new MemberId(rs.getLong("member_id")),
+                        new ThemeId(rs.getLong("theme_id")),
+                        new TimeId(rs.getLong("time_id")),
+                        rs.getDate("date").toLocalDate()
+                ),
+                rs.getLong("rank")
+        ), theme, date, time, memberId);
+
+        return waitingWithRank != null ? waitingWithRank.getRank() : 0;
+    }
+
+    public List<MyReservationResponse> findAllByMemberId(Long memberId) {
+        String sql = """
+                SELECT
+                  A.id,
+                  B.name,
+                  A.date,
+                  C.time_value,
+                  RANK() OVER (PARTITION BY A.theme_id, A.time_id, A.date ORDER BY A.id) AS rank
+                FROM WAITING A
+                JOIN THEME B ON A.theme_id = B.id
+                JOIN TIME C ON A.time_id = C.id
+                where A.member_id = ?
+                """;
+
+        return jdbcTemplate.query(sql, (rs, rowNum) -> new MyReservationResponse(
+                rs.getLong("id"),
+                rs.getString("name"),
+                rs.getString("date"),
+                rs.getString("time_value"),
+                rs.getString("rank") + "번째 예약대기"
+        ), memberId);
+    }
+
+    public void delete(Long memberId, Long waitingId) {
+        waitingJpaRepository.deleteByMemberIdAndId(new MemberId(memberId), waitingId);
+    }
+
+    public boolean existWaiting(MemberId memberId, ThemeId themeId, TimeId timeId) {
+        return waitingJpaRepository.existsByMemberIdAndThemeIdAndTimeId(memberId, themeId, timeId);
+    }
+}
diff --git a/src/main/java/roomescape/waiting/WaitingRequest.java b/src/main/java/roomescape/waiting/WaitingRequest.java
new file mode 100644
index 000000000..3778d91b4
--- /dev/null
+++ b/src/main/java/roomescape/waiting/WaitingRequest.java
@@ -0,0 +1,28 @@
+package roomescape.waiting;
+
+import java.time.LocalDate;
+
+public class WaitingRequest {
+
+    private final LocalDate date;
+    private final Long theme;
+    private final Long time;
+
+    public WaitingRequest(LocalDate date, Long theme, Long time) {
+        this.date = date;
+        this.theme = theme;
+        this.time = time;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public Long getTheme() {
+        return theme;
+    }
+
+    public Long getTime() {
+        return time;
+    }
+}
diff --git a/src/main/java/roomescape/waiting/WaitingResponse.java b/src/main/java/roomescape/waiting/WaitingResponse.java
new file mode 100644
index 000000000..69e8c6ba5
--- /dev/null
+++ b/src/main/java/roomescape/waiting/WaitingResponse.java
@@ -0,0 +1,18 @@
+package roomescape.waiting;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class WaitingResponse {
+
+    private final Long waitingNumber;
+
+    @JsonCreator
+    public WaitingResponse(@JsonProperty("waitingNumber") Long waitingNumber) {
+        this.waitingNumber = waitingNumber;
+    }
+
+    public Long getWaitingNumber() {
+        return waitingNumber;
+    }
+}
diff --git a/src/main/java/roomescape/waiting/WaitingService.java b/src/main/java/roomescape/waiting/WaitingService.java
new file mode 100644
index 000000000..440f2a5ab
--- /dev/null
+++ b/src/main/java/roomescape/waiting/WaitingService.java
@@ -0,0 +1,37 @@
+package roomescape.waiting;
+
+import jakarta.transaction.Transactional;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WaitingService {
+
+    private final WaitingRepository waitingRepository;
+
+    public WaitingService(WaitingRepository waitingRepository) {
+        this.waitingRepository = waitingRepository;
+    }
+
+    @Transactional
+    public Long create(Long memberId, WaitingRequest waitingRequest) {
+        Waiting waiting = new Waiting(
+                new MemberId(memberId),
+                new ThemeId(waitingRequest.getTheme()),
+                new TimeId(waitingRequest.getTime()),
+                waitingRequest.getDate()
+        );
+
+        if (waitingRepository.existWaiting(new MemberId(memberId), new ThemeId(waitingRequest.getTheme()), new TimeId(waitingRequest.getTime()))) {
+            throw new WaitingAlreadyExistException();
+        }
+
+        waitingRepository.save(waiting);
+
+        return waitingRepository.findMyRank(memberId, waitingRequest.getDate(), waitingRequest.getTheme(), waitingRequest.getTime());
+    }
+
+    @Transactional
+    public void cancel(Long memberId, Long waitingId) {
+        waitingRepository.delete(memberId, waitingId);
+    }
+}
diff --git a/src/main/java/roomescape/waiting/WaitingWithRank.java b/src/main/java/roomescape/waiting/WaitingWithRank.java
new file mode 100644
index 000000000..a35622388
--- /dev/null
+++ b/src/main/java/roomescape/waiting/WaitingWithRank.java
@@ -0,0 +1,20 @@
+package roomescape.waiting;
+
+public class WaitingWithRank {
+
+    private Waiting waiting;
+    private Long rank;
+
+    public WaitingWithRank(Waiting waiting, Long rank) {
+        this.waiting = waiting;
+        this.rank = rank;
+    }
+
+    public Waiting getWaiting() {
+        return waiting;
+    }
+
+    public Long getRank() {
+        return rank;
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 612d9890e..7a1b2e882 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -3,9 +3,8 @@ spring.h2.console.enabled=true
 spring.h2.console.path=/h2-console
 spring.datasource.url=jdbc:h2:mem:database
 
-#spring.jpa.show-sql=true
-#spring.jpa.properties.hibernate.format_sql=true
-#spring.jpa.ddl-auto=create-drop
-#spring.jpa.defer-datasource-initialization=true
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.defer-datasource-initialization=true
 
-roomescape.auth.jwt.secret= Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=
\ No newline at end of file
+roomescape.auth.jwt.secret= Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 75c947a5a..39aeea392 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,42 +1,3 @@
-CREATE TABLE time
-(
-    id         BIGINT      NOT NULL AUTO_INCREMENT,
-    time_value VARCHAR(20) NOT NULL,
-    deleted    BOOLEAN     NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE theme
-(
-    id          BIGINT       NOT NULL AUTO_INCREMENT,
-    name        VARCHAR(255) NOT NULL,
-    description VARCHAR(255) NOT NULL,
-    deleted     BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE member
-(
-    id       BIGINT              NOT NULL AUTO_INCREMENT,
-    name     VARCHAR(255)        NOT NULL,
-    email    VARCHAR(255) UNIQUE NOT NULL,
-    password VARCHAR(255)        NOT NULL,
-    role     VARCHAR(255)        NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE reservation
-(
-    id       BIGINT       NOT NULL AUTO_INCREMENT,
-    date     VARCHAR(255) NOT NULL,
-    name     VARCHAR(255) NOT NULL,
-    time_id  BIGINT,
-    theme_id BIGINT,
-    PRIMARY KEY (id),
-    FOREIGN KEY (time_id) REFERENCES time (id),
-    FOREIGN KEY (theme_id) REFERENCES theme (id)
-);
-
 INSERT INTO member (name, email, password, role)
 VALUES ('어드민', 'admin@email.com', 'password', 'ADMIN'),
        ('브라운', 'brown@email.com', 'password', 'USER');
@@ -54,7 +15,10 @@ VALUES ('10:00'),
        ('18:00'),
        ('20:00');
 
-INSERT INTO reservation (name, date, time_id, theme_id)
-VALUES ('어드민', '2024-03-01', 1, 1),
-       ('어드민', '2024-03-01', 2, 2),
-       ('어드민', '2024-03-01', 3, 3);
\ No newline at end of file
+INSERT INTO reservation (member_id, name, date, time_id, theme_id)
+VALUES (1, '', '2025-06-01', 1, 1),
+(1, '', '2025-06-01', 2, 2),
+(1, '', '2025-06-01', 3, 3);
+
+INSERT INTO reservation (member_id, name, date, time_id, theme_id)
+VALUES (2, '브라운', '2025-06-01', 1, 2);
diff --git a/src/test/java/roomescape/JpaTest.java b/src/test/java/roomescape/JpaTest.java
new file mode 100644
index 000000000..467542e60
--- /dev/null
+++ b/src/test/java/roomescape/JpaTest.java
@@ -0,0 +1,31 @@
+package roomescape;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import roomescape.time.Time;
+import roomescape.time.TimeRepository;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DataJpaTest
+public class JpaTest {
+    
+    @Autowired
+    private TestEntityManager entityManager;
+    
+    @Autowired
+    private TimeRepository timeRepository;
+    
+    @Test
+    void 사단계() {
+        Time time = new Time("10:00");
+        entityManager.persist(time);
+        entityManager.flush();
+
+        Time persistTime = timeRepository.findById(time.getId()).orElse(null);
+        
+        assertThat(persistTime.getTime()).isEqualTo(time.getTime());
+    }
+}
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 6877619e9..2d2c5f257 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -8,9 +8,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.annotation.DirtiesContext;
+import roomescape.reservation.MyReservationResponse;
 import roomescape.reservation.ReservationResponse;
+import roomescape.waiting.WaitingResponse;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -115,4 +118,58 @@ private String createToken(String mail, String password) {
 
         return response.headers().get("Set-Cookie").getValue().split(";")[0].split("=")[1];
     }
-}
\ No newline at end of file
+
+    @Test
+    void 오단계() {
+        String adminToken = createToken("admin@email.com", "password");
+
+        List<MyReservationResponse> reservations = RestAssured.given().log().all()
+                .cookie("token", adminToken)
+                .get("/reservations-mine")
+                .then().log().all()
+                .statusCode(200)
+                .extract().jsonPath().getList(".", MyReservationResponse.class);
+
+        assertThat(reservations).hasSize(3);
+    }
+
+    @Test
+    void 육단계() {
+        String brownToken = createToken("brown@email.com", "password");
+
+        Map<String, String> params = new HashMap<>();
+        params.put("date", "2024-03-01");
+        params.put("time", "1");
+        params.put("theme", "1");
+
+        // 예약 대기 생성
+        WaitingResponse waiting = RestAssured.given().log().all()
+                .body(params)
+                .cookie("token", brownToken)
+                .contentType(ContentType.JSON)
+                .post("/waitings")
+                .then().log().all()
+                .statusCode(201)
+                .extract().as(WaitingResponse.class);
+
+        // 내 예약 목록 조회
+        List<MyReservationResponse> myReservations = RestAssured.given().log().all()
+                .body(params)
+                .cookie("token", brownToken)
+                .contentType(ContentType.JSON)
+                .get("/reservations-mine")
+                .then().log().all()
+                .statusCode(200)
+                .extract().jsonPath().getList(".", MyReservationResponse.class);
+
+        // 예약 대기 상태 확인
+        String status = myReservations.stream()
+                .filter(it -> it.getId() == waiting.getWaitingNumber())
+                .filter(it -> !it.getStatus().equals("예약"))
+                .findFirst()
+                .map(it -> it.getStatus())
+                .orElse(null);
+
+        assertThat(status).isEqualTo("1번째 예약대기");
+    }
+}