diff --git a/src/test/java/es/uvigo/esei/daa/rest/PetResourceTest.java b/src/test/java/es/uvigo/esei/daa/rest/PetResourceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..09349dfd1f759e25e0b054458e6984abea4daf64
--- /dev/null
+++ b/src/test/java/es/uvigo/esei/daa/rest/PetResourceTest.java
@@ -0,0 +1,221 @@
+package es.uvigo.esei.daa.rest;
+
+
+import static es.uvigo.esei.daa.dataset.PetDataset.*;
+import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasBadRequestStatus;
+import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasOkStatus;
+import static es.uvigo.esei.daa.matchers.IsEqualToPet.*;
+import static javax.ws.rs.client.Entity.entity;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.sql.DataSource;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.github.springtestdbunit.DbUnitTestExecutionListener;
+import com.github.springtestdbunit.annotation.DatabaseSetup;
+import com.github.springtestdbunit.annotation.ExpectedDatabase;
+
+import es.uvigo.esei.daa.DAAExampleApplication;
+import es.uvigo.esei.daa.entities.Pet;
+import es.uvigo.esei.daa.entities.Pet;
+import es.uvigo.esei.daa.listeners.ApplicationContextBinding;
+import es.uvigo.esei.daa.listeners.ApplicationContextJndiBindingTestExecutionListener;
+import es.uvigo.esei.daa.listeners.DbManagement;
+import es.uvigo.esei.daa.listeners.DbManagementTestExecutionListener;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:contexts/mem-context.xml")
+@TestExecutionListeners({
+	DbUnitTestExecutionListener.class,
+	DbManagementTestExecutionListener.class,
+	ApplicationContextJndiBindingTestExecutionListener.class
+})
+@ApplicationContextBinding(
+	jndiUrl = "java:/comp/env/jdbc/daaexample",
+	type = DataSource.class
+)
+@DbManagement(
+	create = "classpath:db/hsqldb.sql",
+	drop = "classpath:db/hsqldb-drop.sql"
+)
+@DatabaseSetup("/datasets/dataset.xml")
+@ExpectedDatabase("/datasets/dataset.xml")
+public class PetResourceTest extends JerseyTest {
+	@Override
+	protected Application configure() {
+		return new DAAExampleApplication();
+	}
+
+	@Override
+	protected void configureClient(ClientConfig config) {
+		super.configureClient(config);
+		
+		// Enables JSON transformation in client
+		config.register(JacksonJsonProvider.class);
+		config.property("com.sun.jersey.api.json.POJOMappingFeature", Boolean.TRUE);
+	}
+	
+	@Test
+	public void testList() throws IOException {
+		final Response response = target("pet").request().get();
+		assertThat(response, hasOkStatus());
+
+		final List<Pet> pets = response.readEntity(new GenericType<List<Pet>>(){});
+		
+		assertThat(pets, containsPetsInAnyOrder(pets()));
+	}
+
+	@Test
+	public void testGet() throws IOException {
+		final Response response = target("pets/" + existentId()).request().get();
+		assertThat(response, hasOkStatus());
+		
+		final Pet pet = response.readEntity(Pet.class);
+		
+		assertThat(pet, is(equalsToPet(existentPet())));
+	}
+
+	@Test
+	public void testGetInvalidId() throws IOException {
+		final Response response = target("pets/" + nonExistentId()).request().get();
+		
+		assertThat(response, hasBadRequestStatus());
+	}
+
+	@Test
+	@ExpectedDatabase("/datasets/dataset-add.xml")
+	public void testAdd() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		form.param("idMaster", Integer.toString(newIdMaster()));
+		
+		final Response response = target("pets")
+			.request(MediaType.APPLICATION_JSON_TYPE)
+			.post(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		assertThat(response, hasOkStatus());
+		
+		final Pet Pet = response.readEntity(Pet.class);
+		
+		assertThat(Pet, is(equalsToPet(newPet())));
+	}
+
+	@Test
+	public void testAddMissingName() throws IOException {
+		final Form form = new Form();
+		form.param("idMaster", Integer.toString(newIdMaster()));
+		
+		final Response response = target("pets")
+			.request(MediaType.APPLICATION_JSON_TYPE)
+			.post(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasBadRequestStatus());
+	}
+
+	@Test
+	public void testAddMissingidMaster() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		
+		final Response response = target("pets")
+			.request(MediaType.APPLICATION_JSON_TYPE)
+			.post(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasBadRequestStatus());
+	}
+
+	@Test
+	@ExpectedDatabase("/datasets/dataset-modify.xml")
+	public void testModify() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		form.param("idMaster", Integer.toString(newIdMaster()));
+		
+		final Response response = target("pets/" + existentId())
+			.request(MediaType.APPLICATION_JSON_TYPE)
+			.put(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		assertThat(response, hasOkStatus());
+		
+		final Pet modifiedPet = response.readEntity(Pet.class);
+		
+		final Pet Pet = existentPet();
+		Pet.setName(newName());
+		Pet.setIdMaster(newIdMaster());
+		
+		assertThat(modifiedPet, is(equalsToPet(Pet)));
+	}
+
+	@Test
+	public void testModifyName() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		
+		final Response response = target("pets/" + existentId())
+			.request(MediaType.APPLICATION_JSON_TYPE)
+			.put(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+
+		assertThat(response, hasBadRequestStatus());
+	}
+
+	@Test
+	public void testModifyidMaster() throws IOException {
+		final Form form = new Form();
+		form.param("idMaster", Integer.toString(newIdMaster()));
+		
+		final Response response = target("pets/" + existentId())
+			.request(MediaType.APPLICATION_JSON_TYPE)
+			.put(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasBadRequestStatus());
+	}
+
+	@Test
+	public void testModifyInvalidId() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		form.param("idMaster", Integer.toString(newIdMaster()));
+		
+		final Response response = target("pets/" + nonExistentId())
+			.request(MediaType.APPLICATION_JSON_TYPE)
+			.put(Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+
+		assertThat(response, hasBadRequestStatus());
+	}
+
+	@Test
+	@ExpectedDatabase("/datasets/dataset-delete.xml")
+	public void testDelete() throws IOException {
+		final Response response = target("pets/" + existentId()).request().delete();
+		
+		assertThat(response, hasOkStatus());
+		
+		final Integer deletedId = response.readEntity(Integer.class);
+		
+		assertThat(deletedId, is(equalTo(existentId())));
+	}
+
+	@Test
+	public void testDeleteInvalidId() throws IOException {
+		final Response response = target("pets/" + nonExistentId()).request().delete();
+
+		assertThat(response, hasBadRequestStatus());
+	}
+}