diff --git a/dives/test21.xml b/dives/test21.xml
new file mode 100644
index 000000000..5f5f6c981
--- /dev/null
+++ b/dives/test21.xml
@@ -0,0 +1,9 @@
+<dives>
+<program name='subsurface' version='1'></program>
+<trip date='2011-12-02' />
+<dive number='20' tripflag='INTRIP' date='2011-12-02' time='14:00:00' duration='30:00 min'>
+  <depth max='20.0 m' mean='15.0 m' />
+  <location>20th test dive - this should be in a trip with same location</location>
+  <notes>We are testing that the location of the dive is picked up in the trip if the trip has no location</notes>
+</dive>
+</dives>
diff --git a/dives/test22.xml b/dives/test22.xml
new file mode 100644
index 000000000..a61032327
--- /dev/null
+++ b/dives/test22.xml
@@ -0,0 +1,9 @@
+<dives>
+<program name='subsurface' version='1'></program>
+<trip date='2011-12-02' location='trip location' />
+<dive number='21' tripflag='INTRIP' date='2011-12-02' time='15:00:00' duration='30:00 min'>
+  <depth max='20.0 m' mean='15.0 m' />
+  <location>21st test dive - this should be in a trip with a trip location</location>
+  <notes>We are testing that the location of the dive is not picked up in the trip if the trip has a location</notes>
+</dive>
+</dives>
diff --git a/dives/test23.xml b/dives/test23.xml
new file mode 100644
index 000000000..c61ad2db9
--- /dev/null
+++ b/dives/test23.xml
@@ -0,0 +1,9 @@
+<dives>
+<program name='subsurface' version='1'></program>
+<trip date='2011-12-02' location='trip location' />
+<dive number='22' tripflag='NOTRIP' date='2011-12-09' time='6:00:00' duration='30:00 min'>
+  <depth max='20.0 m' mean='15.0 m' />
+  <location>22nd test dive - this should not be in a trip</location>
+  <notes>We are testing that the NOTRIP flag works</notes>
+</dive>
+</dives>