diff --git a/packages/astro/test/astro-collection.test.js b/packages/astro/test/astro-collection.test.js
index 4f685b355..d3b73e5c4 100644
--- a/packages/astro/test/astro-collection.test.js
+++ b/packages/astro/test/astro-collection.test.js
@@ -17,7 +17,7 @@ Collections('shallow selector (*.md)', async ({ runtime }) => {
     }),
   ];
   // assert they loaded in newest -> oldest order (not alphabetical)
-  assert.equal(urls, ['/post/three', '/post/two', '/post/one']);
+  assert.equal(urls, ['/post/six', '/post/five', '/post/three', '/post/two', '/post/one']);
 });
 
 Collections('deep selector (**/*.md)', async ({ runtime }) => {
@@ -29,7 +29,7 @@ Collections('deep selector (**/*.md)', async ({ runtime }) => {
       return $(this).attr('href');
     }),
   ];
-  assert.equal(urls, ['/post/nested/a', '/post/three', '/post/two', '/post/one']);
+  assert.equal(urls, ['/post/nested/a', '/post/six', '/post/five', '/post/three', '/post/two', '/post/one']);
 });
 
 Collections('generates pagination successfully', async ({ runtime }) => {
@@ -123,4 +123,18 @@ Collections('matches collection filename exactly', async ({ runtime }) => {
   assert.equal(urls, ['/post/nested/a', '/post/three', '/post/two', '/post/one']);
 });
 
+Collections('have the proper amount of elements with respecting published / draft documents', async ({ runtime }) => {
+  const result = await runtime.load('/paginated');
+  if (result.error) throw new Error(result.error);
+  const $ = doc(result.contents);
+
+
+  const start = $('#start');
+  const end = $('#end');
+  const total = $('#total');
+  assert.equal(start.text(), "0");
+  assert.equal(end.text(), "4"); 
+  assert.equal(total.text(), "5"); 
+});
+
 Collections.run();
diff --git a/packages/astro/test/fixtures/astro-collection/src/pages/$paginated.astro b/packages/astro/test/fixtures/astro-collection/src/pages/$paginated.astro
index d7383dffe..a061d4481 100644
--- a/packages/astro/test/fixtures/astro-collection/src/pages/$paginated.astro
+++ b/packages/astro/test/fixtures/astro-collection/src/pages/$paginated.astro
@@ -22,6 +22,12 @@ export async function createCollection() {
 ))}
 </div>
 
+<div id="results">
+  <span id="start">{collection.start}</span>  
+  <span id="end">{collection.end}</span> 
+  <span id="total">{collection.total}</span> 
+</div>
+
 <nav>
   {collection.url.prev && <a id="prev-page" href={collection.url.prev}>Previous page</a>}
   {collection.url.next && <a id="next-page" href={collection.url.next}>Next page</a>}
diff --git a/packages/astro/test/fixtures/astro-collection/src/pages/post/five.md b/packages/astro/test/fixtures/astro-collection/src/pages/post/five.md
new file mode 100644
index 000000000..a5b6634d9
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-collection/src/pages/post/five.md
@@ -0,0 +1,9 @@
+---
+title: Post Five
+date: 2021-04-17 00:00:00
+draft: false
+---
+
+# Post Five
+
+I’m the fifth blog post
diff --git a/packages/astro/test/fixtures/astro-collection/src/pages/post/four.md b/packages/astro/test/fixtures/astro-collection/src/pages/post/four.md
new file mode 100644
index 000000000..1fcf03e80
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-collection/src/pages/post/four.md
@@ -0,0 +1,9 @@
+---
+title: Post Four
+date: 2021-04-16 00:00:00
+published: false
+---
+
+# Post Four
+
+I’m the fourth blog post
diff --git a/packages/astro/test/fixtures/astro-collection/src/pages/post/six.md b/packages/astro/test/fixtures/astro-collection/src/pages/post/six.md
new file mode 100644
index 000000000..d059b199f
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-collection/src/pages/post/six.md
@@ -0,0 +1,9 @@
+---
+title: Post Six
+date: 2021-04-18 00:00:00
+published: true
+---
+
+# Post Six
+
+I’m the sixth blog post
diff --git a/packages/astro/test/fixtures/astro-collection/src/pages/post/two.md b/packages/astro/test/fixtures/astro-collection/src/pages/post/two.md
index 2f6f85e11..f5fc354b0 100644
--- a/packages/astro/test/fixtures/astro-collection/src/pages/post/two.md
+++ b/packages/astro/test/fixtures/astro-collection/src/pages/post/two.md
@@ -1,7 +1,11 @@
 ---
 title: Post Two
 date: 2021-04-14 00:00:00
+<<<<<<< HEAD
 author: author-two
+=======
+draft: true
+>>>>>>> dab211b (adds tests for markdown draft / published attributes)
 ---
 
 # Post Two
diff --git a/packages/astro/test/fixtures/plain-markdown/src/pages/post-draft.md b/packages/astro/test/fixtures/plain-markdown/src/pages/post-draft.md
new file mode 100644
index 000000000..2266cfe57
--- /dev/null
+++ b/packages/astro/test/fixtures/plain-markdown/src/pages/post-draft.md
@@ -0,0 +1,18 @@
+---
+layout: ../layouts/content.astro
+title: My Blog Post
+description: This is a post about some stuff.
+published: true
+---
+
+## Interesting Topic
+
+Hello world!
+
+```json
+{ 
+  "key": "value"
+}
+```
+
+<div id="first">Some content</div>
diff --git a/packages/astro/test/fixtures/plain-markdown/src/pages/post-no-draft.md b/packages/astro/test/fixtures/plain-markdown/src/pages/post-no-draft.md
new file mode 100644
index 000000000..84c996158
--- /dev/null
+++ b/packages/astro/test/fixtures/plain-markdown/src/pages/post-no-draft.md
@@ -0,0 +1,18 @@
+---
+layout: ../layouts/content.astro
+title: My Blog Post
+description: This is a post about some stuff.
+draft: false
+---
+
+## Interesting Topic
+
+Hello world!
+
+```json
+{ 
+  "key": "value"
+}
+```
+
+<div id="first">Some content</div>
diff --git a/packages/astro/test/fixtures/plain-markdown/src/pages/post-published.md b/packages/astro/test/fixtures/plain-markdown/src/pages/post-published.md
new file mode 100644
index 000000000..2266cfe57
--- /dev/null
+++ b/packages/astro/test/fixtures/plain-markdown/src/pages/post-published.md
@@ -0,0 +1,18 @@
+---
+layout: ../layouts/content.astro
+title: My Blog Post
+description: This is a post about some stuff.
+published: true
+---
+
+## Interesting Topic
+
+Hello world!
+
+```json
+{ 
+  "key": "value"
+}
+```
+
+<div id="first">Some content</div>
diff --git a/packages/astro/test/fixtures/plain-markdown/src/pages/post-unpublished.md b/packages/astro/test/fixtures/plain-markdown/src/pages/post-unpublished.md
new file mode 100644
index 000000000..c1809b622
--- /dev/null
+++ b/packages/astro/test/fixtures/plain-markdown/src/pages/post-unpublished.md
@@ -0,0 +1,18 @@
+---
+layout: ../layouts/content.astro
+title: My Blog Post
+description: This is a post about some stuff.
+published: false
+---
+
+## Interesting Topic
+
+Hello world!
+
+```json
+{ 
+  "key": "value"
+}
+```
+
+<div id="first">Some content</div>
diff --git a/packages/astro/test/plain-markdown.test.js b/packages/astro/test/plain-markdown.test.js
index 3adc904f5..e276ceec9 100644
--- a/packages/astro/test/plain-markdown.test.js
+++ b/packages/astro/test/plain-markdown.test.js
@@ -30,6 +30,40 @@ Markdown('Can load a realworld markdown page with Astro', async ({ runtime }) =>
   assert.equal($('pre').length, 7);
 });
 
+Markdown('Cant load a post being unpublished', async ({ runtime }) => {
+  const result = await runtime.load('/post-unpublished');
+  
+  assert.type(result.error, 'object')
+  assert.equal(result.error.message, 'Unpublished document');
+  assert.equal(result.statusCode, 404);
+});
+
+Markdown('Cant load a post being published', async ({ runtime }) => {
+  const result = await runtime.load('/post-published');
+  if (result.error) throw new Error(result.error);
+
+  assert.equal(result.statusCode, 200);
+
+  const $ = doc(result.contents);
+
+  assert.equal($('p').first().text(), 'Hello world!');
+  assert.equal($('#first').text(), 'Some content');
+  assert.equal($('#interesting-topic').text(), 'Interesting Topic');
+});
+
+Markdown('Cant load a post being in draft status', async ({ runtime }) => {
+  const result = await runtime.load('/post-draft');
+  if (result.error) throw new Error(result.error);
+
+  assert.equal(result.statusCode, 200);
+
+  const $ = doc(result.contents);
+
+  assert.equal($('p').first().text(), 'Hello world!');
+  assert.equal($('#first').text(), 'Some content');
+  assert.equal($('#interesting-topic').text(), 'Interesting Topic');
+});
+
 Markdown('Builds markdown pages for prod', async (context) => {
   await context.build();
 });